Skip to content

Commit 39a6298

Browse files
author
Unity Technologies
committed
Unity 2019.2.0b9 C# reference source code
1 parent 488c3da commit 39a6298

18 files changed

Lines changed: 86 additions & 421 deletions

File tree

‎Editor/Mono/BuildPlayerWindow.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,6 @@ void ShowBuildTargetSettings()
784784
GUILayout.EndHorizontal();
785785
}
786786

787-
if (buildTarget == BuildTarget.Android)
788-
AndroidPublishGUI();
789-
790787
GUIBuildButtons(buildWindowExtension, enableBuildButton, enableBuildAndRunButton,
791788
canInstallInBuildFolder, platform);
792789
}

‎Editor/Mono/BuildPlayerWindowPublish.cs‎

Lines changed: 0 additions & 327 deletions
This file was deleted.

‎Editor/Mono/GUI/PopupWindow.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ internal void CloseContent()
136136
{
137137
if (m_WindowContent != null)
138138
m_WindowContent.OnClose();
139-
m_WindowContent = null;
140139
}
141140
}
142141
}

‎Editor/Mono/Inspector/Enlighten/LightmapParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ internal override void OnHeaderControlsGUI()
118118
private class Styles
119119
{
120120
public static readonly GUIContent generalGIContent = EditorGUIUtility.TrTextContent("General GI", "Settings used in both Precomputed Realtime Global Illumination and Baked Global Illumination.");
121-
public static readonly GUIContent precomputedRealtimeGIContent = EditorGUIUtility.TrTextContent("Realtime GI", "Settings used in Precomputed Realtime Global Illumination where it is precomputed how indirect light can bounce between static objects, but the final lighting is done at runtime. Lights, ambient lighting in addition to the materials and emission of static objects can still be changed at runtime. Only static objects can affect GI by blocking and bouncing light, but non-static objects can receive bounced light via light probes."); // Reuse the label from the Lighting window
121+
public static readonly GUIContent precomputedRealtimeGIContent = EditorGUIUtility.TrTextContent("Realtime GI (Deprecated)", "Settings used in Precomputed Realtime Global Illumination where it is precomputed how indirect light can bounce between static objects, but the final lighting is done at runtime. Lights, ambient lighting in addition to the materials and emission of static objects can still be changed at runtime. Only static objects can affect GI by blocking and bouncing light, but non-static objects can receive bounced light via light probes."); // Reuse the label from the Lighting window
122122
public static readonly GUIContent resolutionContent = EditorGUIUtility.TrTextContent("Resolution", "Realtime lightmap resolution in texels per world unit. This value is multiplied by the realtime resolution in the Lighting window to give the output lightmap resolution. This should generally be an order of magnitude less than what is common for baked lightmaps to keep the precompute time manageable and the performance at runtime acceptable. Note that if this is made more fine-grained, then the Irradiance Budget will often need to be increased too, to fully take advantage of this increased detail.");
123123
public static readonly GUIContent clusterResolutionContent = EditorGUIUtility.TrTextContent("Cluster Resolution", "The ratio between the resolution of the clusters with which light bounce is calculated and the resolution of the output lightmaps that sample from these.");
124124
public static readonly GUIContent irradianceBudgetContent = EditorGUIUtility.TrTextContent("Irradiance Budget", "The amount of data used by each texel in the output lightmap. Specifies how fine-grained a view of the scene an output texel has. Small values mean more averaged out lighting, since the light contributions from more clusters are treated as one. Affects runtime memory usage and to a lesser degree runtime CPU usage.");

‎Editor/Mono/InternalEditorUtility.bindings.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ public extern static bool inBatchMode
129129
[NativeMethod("PerformUnmarkedBumpMapTexturesFixingAfterDialog")]
130130
public extern static void BumpMapSettingsFixingWindowReportResult(int result);
131131

132+
[StaticAccessor("BumpMapSettings::Get()", StaticAccessorType.Dot)]
133+
[NativeMethod("PerformUnmarkedBumpMapTexturesFixing")]
134+
public extern static bool PerformUnmarkedBumpMapTexturesFixing();
135+
132136
[FreeFunction("InternalEditorUtilityBindings::BumpMapTextureNeedsFixingInternal")]
133137
public extern static bool BumpMapTextureNeedsFixingInternal(Material material, string propName, bool flaggedAsNormal);
134138

‎Editor/Mono/ProjectWindow/ProjectWindowUtil.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,11 @@ public static void CreateScriptAssetFromTemplateFile(string templatePath, string
329329
icon = EditorGUIUtility.IconContent<Shader>().image as Texture2D;
330330
break;
331331
case ".asmdef":
332-
case ".asmref":
333332
icon = EditorGUIUtility.IconContent<AssemblyDefinitionAsset>().image as Texture2D;
334333
break;
334+
case ".asmref":
335+
icon = EditorGUIUtility.IconContent<AssemblyDefinitionReferenceAsset>().image as Texture2D;
336+
break;
335337
default:
336338
icon = EditorGUIUtility.IconContent<TextAsset>().image as Texture2D;
337339
break;

‎Editor/Mono/SceneModeWindows/LightingWindowBakeSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ static class Styles
825825
public static readonly GUIContent FinalGatherFiltering = EditorGUIUtility.TrTextContent("Denoising", "Controls whether a denoising filter is applied to the final gather output.");
826826
public static readonly GUIContent SubtractiveShadowColor = EditorGUIUtility.TrTextContent("Realtime Shadow Color", "The color used for mixing realtime shadows with baked lightmaps in Subtractive lighting mode. The color defines the darkest point of the realtime shadow.");
827827
public static readonly GUIContent MixedLightMode = EditorGUIUtility.TrTextContent("Lighting Mode", "Specifies which Scene lighting mode will be used for all Mixed lights in the Scene. Options are Baked Indirect, Shadowmask and Subtractive.");
828-
public static readonly GUIContent UseRealtimeGI = EditorGUIUtility.TrTextContent("Realtime Global Illumination", "Controls whether Realtime lights in the Scene contribute indirect light. If enabled, Realtime lights contribute both direct and indirect light. If disabled, Realtime lights only contribute direct light. This can be disabled on a per-light basis in the light component Inspector by setting Indirect Multiplier to 0.");
828+
public static readonly GUIContent UseRealtimeGI = EditorGUIUtility.TrTextContent("Realtime Global Illumination (Deprecated)", "Enlighten is entering deprecation. Please ensure that your project will not require support for Enlighten beyond the deprecation date.");
829829
public static readonly GUIContent BakedGIDisabledInfo = EditorGUIUtility.TrTextContent("All Baked and Mixed lights in the Scene are currently being overridden to Realtime light modes. Enable Baked Global Illumination to allow the use of Baked and Mixed light modes.");
830830
public static readonly GUIContent BakeBackend = EditorGUIUtility.TrTextContent("Lightmapper", "Specifies which baking system will be used to generate baked lightmaps.");
831831
//public static readonly GUIContent PVRSampling = EditorGUIUtility.TrTextContent("Sampling", "How to sample the lightmaps. Auto and adaptive automatically test for convergence. Auto uses a maximum of 16K samples. Adaptive uses a configurable maximum number of samples. Fixed always uses the set number of samples and does not test for convergence.");

0 commit comments

Comments
 (0)