Unity 2017.4.27f1 C# reference source code

Unity Technologies · Unity Technologies · commit 7f45d1da0be9 · 2019-05-10T13:21:41.000Z
diff --git a/Editor/Mono/SettingsWindow/LightingEditor.cs b/Editor/Mono/SettingsWindow/LightingEditor.cs
@@ -16,7 +16,6 @@ internal enum DefaultReflectionMode
         Custom
     }
 
-    [CustomEditor(typeof(RenderSettings))]
     internal class LightingEditor : Editor
     {
         internal static class Styles
@@ -77,31 +76,38 @@ static Styles() {}
         protected SerializedProperty m_CustomReflection;
         protected SerializedProperty m_ReflectionCompression;
 
+        protected SerializedObject m_RenderSettings;
         protected SerializedObject m_LightmapSettings;
 
         private bool m_bShowEnvironment;
         private const string kShowEnvironment = "ShowEnvironment";
 
-        public virtual void OnEnable()
+        private void InitSettings()
         {
-            m_Sun = serializedObject.FindProperty("m_Sun");
-            m_AmbientSource = serializedObject.FindProperty("m_AmbientMode");
-            m_AmbientSkyColor = serializedObject.FindProperty("m_AmbientSkyColor");
-            m_AmbientEquatorColor = serializedObject.FindProperty("m_AmbientEquatorColor");
-            m_AmbientGroundColor = serializedObject.FindProperty("m_AmbientGroundColor");
-            m_AmbientIntensity = serializedObject.FindProperty("m_AmbientIntensity");
-            m_ReflectionIntensity = serializedObject.FindProperty("m_ReflectionIntensity");
-            m_ReflectionBounces = serializedObject.FindProperty("m_ReflectionBounces");
-            m_SkyboxMaterial = serializedObject.FindProperty("m_SkyboxMaterial");
-            m_DefaultReflectionMode = serializedObject.FindProperty("m_DefaultReflectionMode");
-            m_DefaultReflectionResolution = serializedObject.FindProperty("m_DefaultReflectionResolution");
-            m_CustomReflection = serializedObject.FindProperty("m_CustomReflection");
+            m_RenderSettings = new SerializedObject(RenderSettings.GetRenderSettings());
+            m_Sun = m_RenderSettings.FindProperty("m_Sun");
+            m_AmbientSource = m_RenderSettings.FindProperty("m_AmbientMode");
+            m_AmbientSkyColor = m_RenderSettings.FindProperty("m_AmbientSkyColor");
+            m_AmbientEquatorColor = m_RenderSettings.FindProperty("m_AmbientEquatorColor");
+            m_AmbientGroundColor = m_RenderSettings.FindProperty("m_AmbientGroundColor");
+            m_AmbientIntensity = m_RenderSettings.FindProperty("m_AmbientIntensity");
+            m_ReflectionIntensity = m_RenderSettings.FindProperty("m_ReflectionIntensity");
+            m_ReflectionBounces = m_RenderSettings.FindProperty("m_ReflectionBounces");
+            m_SkyboxMaterial = m_RenderSettings.FindProperty("m_SkyboxMaterial");
+            m_DefaultReflectionMode = m_RenderSettings.FindProperty("m_DefaultReflectionMode");
+            m_DefaultReflectionResolution = m_RenderSettings.FindProperty("m_DefaultReflectionResolution");
+            m_CustomReflection = m_RenderSettings.FindProperty("m_CustomReflection");
 
             m_LightmapSettings = new SerializedObject(LightmapEditorSettings.GetLightmapSettings());
             m_ReflectionCompression = m_LightmapSettings.FindProperty("m_LightmapEditorSettings.m_ReflectionCompression");
             m_AmbientLightingMode = m_LightmapSettings.FindProperty("m_GISettings.m_EnvironmentLightingMode");
 
-            m_bShowEnvironment  = SessionState.GetBool(kShowEnvironment, true);
+            m_bShowEnvironment = SessionState.GetBool(kShowEnvironment, true);
+        }
+
+        public virtual void OnEnable()
+        {
+            InitSettings();
         }
 
         public virtual void OnDisable()
@@ -111,6 +117,11 @@ public virtual void OnDisable()
 
         private void DrawGUI()
         {
+            if (m_RenderSettings == null || m_RenderSettings.targetObject != RenderSettings.GetRenderSettings())
+            {
+                InitSettings();
+            }
+
             Material skyboxMaterial = m_SkyboxMaterial.objectReferenceValue as Material;
 
             m_bShowEnvironment = EditorGUILayout.FoldoutTitlebar(m_bShowEnvironment, Styles.env_top, true);
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2017.4.26f1 C# reference source code
+## Unity 2017.4.27f1 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2017.4.26f1 C# reference source code`
	`1`	`+## Unity 2017.4.27f1 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`