Skip to content

Commit a2bdfe9

Browse files
author
Unity Technologies
committed
Unity 2023.1.0a26 C# reference source code
1 parent 664dfe3 commit a2bdfe9

File tree

45 files changed

+1481
-608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1481
-608
lines changed

Editor/Mono/AttributeHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ struct MonoCreateAssetItem
145145
}
146146

147147
[RequiredByNativeCode]
148-
static MonoCreateAssetItem[] ExtractCreateAssetMenuItems(Assembly assembly)
148+
static MonoCreateAssetItem[] ExtractCreateAssetMenuItems()
149149
{
150150
var result = new List<MonoCreateAssetItem>();
151151

Editor/Mono/EditorSettings.bindings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public enum EnterPlayModeOptions
6969
None = 0,
7070
DisableDomainReload = 1 << 0,
7171
DisableSceneReload = 1 << 1,
72+
[Obsolete("Option has no effect and is deprecated.")]
7273
DisableSceneBackupUnlessDirty = 1 << 2
7374
}
7475

Editor/Mono/ImportSettings/SpeedTreeImporterModelEditor.cs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,36 @@ private void ShowMeshGUI()
323323

324324
EditorGUILayout.Space();
325325
}
326+
327+
bool ShouldRenderHueVariationDropdown()
328+
{
329+
SpeedTreeImporter importer = importers.First();
330+
331+
if (importer.enableHueByDefault)
332+
{
333+
return true;
334+
}
335+
336+
for (int i = 0; i < importer.enableHue.Length; ++i)
337+
{
338+
if (importer.enableSettingOverride[i] && importer.enableHue[i])
339+
{
340+
return true;
341+
}
342+
}
343+
344+
return false;
345+
}
346+
326347
public void ShowMaterialGUI()
327348
{
328349
EditorGUILayout.LabelField("Material", EditorStyles.boldLabel);
329350

330351
EditorGUILayout.PropertyField(m_MainColor, Styles.MainColor);
331352
EditorGUILayout.PropertyField(m_EnableHueVariation, Styles.EnableColorVariation);
332-
if (importers.First().enableHueByDefault)
353+
354+
355+
if (ShouldRenderHueVariationDropdown())
333356
{
334357
EditorGUILayout.PropertyField(m_HueVariation, Styles.HueVariation);
335358
}

Editor/Mono/Inspector/EditorSettingsInspector.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class Content
9393
public static readonly GUIContent enterPlayModeOptionsEnabled = EditorGUIUtility.TrTextContent("Enter Play Mode Options", "Enables options when Entering Play Mode");
9494
public static readonly GUIContent enterPlayModeOptionsEnableDomainReload = EditorGUIUtility.TrTextContent("Reload Domain", "Enables Domain Reload when Entering Play Mode. Domain reload reinitializes game completely making loading behavior very close to the Player");
9595
public static readonly GUIContent enterPlayModeOptionsEnableSceneReload = EditorGUIUtility.TrTextContent("Reload Scene", "Enables Scene Reload when Entering Play Mode. Scene reload makes loading behavior and performance characteristics very close to the Player");
96-
public static readonly GUIContent enterPlayModeOptionsEnableSceneBackup = EditorGUIUtility.TrTextContent("Scene Backup", "Force writing a backup of all the open scenes to disk even if scenes are not dirty when entering Play mode. Only scenes that are modified in-memory actually need to be backed up, but making modifications from script may change the scene without setting the scene's dirty flag.");
9796

9897
public static readonly GUIContent numberingScheme = EditorGUIUtility.TrTextContent("Numbering Scheme");
9998

@@ -1002,7 +1001,6 @@ private void DoEnterPlayModeSettings()
10021001
EnterPlayModeOptions options = (EnterPlayModeOptions)m_EnterPlayModeOptions.intValue;
10031002
options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableDomainReload, Content.enterPlayModeOptionsEnableDomainReload);
10041003
options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableSceneReload, Content.enterPlayModeOptionsEnableSceneReload);
1005-
options = ToggleEnterPlayModeOptions(options, EnterPlayModeOptions.DisableSceneBackupUnlessDirty, Content.enterPlayModeOptionsEnableSceneBackup);
10061004

10071005
if (m_EnterPlayModeOptions.intValue != (int)options)
10081006
{

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
22092209
}
22102210

22112211
// Tickbox for OpenGL-only option to toggle Profiler GPU Recorders.
2212-
if (platform.namedBuildTarget == NamedBuildTarget.Standalone || platform.namedBuildTarget == NamedBuildTarget.Android)
2212+
if (platform.namedBuildTarget == NamedBuildTarget.Standalone || platform.namedBuildTarget == NamedBuildTarget.Android || platform.namedBuildTarget == NamedBuildTarget.EmbeddedLinux || platform.namedBuildTarget == NamedBuildTarget.QNX)
22132213
{
22142214
PlayerSettings.enableOpenGLProfilerGPURecorders = EditorGUILayout.Toggle(SettingsContent.enableOpenGLProfilerGPURecorders, PlayerSettings.enableOpenGLProfilerGPURecorders);
22152215

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,10 @@ public void SplashSectionGUI(BuildPlatform platform, ISettingEditorExtension set
319319
}
320320
else
321321
{
322-
ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, k_Texts.vrSplashScreen);
322+
bool VREnabled = BuildPipeline.IsFeatureSupported("ENABLE_VR", platform.defaultTarget);
323+
324+
if (VREnabled)
325+
ObjectReferencePropertyField<Texture2D>(m_VirtualRealitySplashScreen, k_Texts.vrSplashScreen);
323326

324327
if (TargetSupportsOptionalBuiltinSplashScreen(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension))
325328
BuiltinCustomSplashScreenGUI(platform.namedBuildTarget.ToBuildTargetGroup(), settingsExtension);

0 commit comments

Comments
 (0)