Skip to content

Commit 36d3deb

Browse files
author
Unity Technologies
committed
Unity 2017.4.19f1 C# reference source code
1 parent 40cc61c commit 36d3deb

File tree

19 files changed

+71
-9
lines changed

19 files changed

+71
-9
lines changed

‎Editor/Mono/Animation/AnimationWindow/ControlPointRenderer.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ public void Render()
102102
renderChunk.isDirty = false;
103103
}
104104

105+
// Previous camera may still be active when calling DrawMeshNow.
106+
Camera.SetupCurrent(null);
107+
105108
Graphics.DrawMeshNow(renderChunk.mesh, Handles.matrix);
106109
}
107110
}

‎Editor/Mono/Animation/AnimationWindow/CurveRenderer/NormalCurveRenderer.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ public static void DrawCurveWrapped(float minTime, float maxTime, float rangeSta
336336
mat.SetColor("_Color", color);
337337
Handles.color = color;
338338

339+
// Previous camera may still be active when calling DrawMeshNow.
340+
Camera.SetupCurrent(null);
341+
339342
mat.SetPass(0);
340343
Graphics.DrawMeshNow(mesh, Handles.matrix * transform);
341344

‎Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ private Rect DopelinesGUI(Rect position, Vector2 scrollPosition)
381381

382382
Rect dopelinesRect = new Rect(position.xMin, position.yMin, position.width, linePosition.yMax - position.yMin);
383383

384-
m_PointRenderer.Render();
384+
if (Event.current.type == EventType.Repaint)
385+
m_PointRenderer.Render();
385386

386387
GUI.color = oldColor;
387388

‎Editor/Mono/Inspector/AnimationClipEditor.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ public bool needsToGenerateClipInfo
209209
const int kPosition = 3;
210210
Vector2[][][] m_QualityCurves = new Vector2[4][][];
211211
bool m_DirtyQualityCurves = false;
212+
bool m_FirstInitialization = true;
212213

213214
private void InitController()
214215
{
@@ -261,7 +262,12 @@ private void InitController()
261262
{
262263
m_AvatarPreview.Animator.Play(0, 0, 0);
263264
m_AvatarPreview.Animator.Update(0);
264-
m_AvatarPreview.ResetPreviewFocus();
265+
266+
if (m_FirstInitialization)
267+
{
268+
m_AvatarPreview.ResetPreviewFocus();
269+
m_FirstInitialization = false;
270+
}
265271
}
266272
}
267273
}

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.Compiler.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.Parser.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Boo.Lang.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Mono.Posix.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/Mono.Security.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Core.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Xml.Linq.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.Xml.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/System.dll

0 Bytes
Binary file not shown.

‎External/Mono/builds/monodistribution/lib/mono/2.0/UnityScript.dll

0 Bytes
Binary file not shown.

‎Projects/CSharp/UnityReferenceSource.sln

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
VisualStudioVersion = 14.0.24720.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55

6-
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "DataContract", "..\..\Tools\PackageManager\DataContract\DataContract.csproj", "{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}"
7-
EndProject
86
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.CecilTools", "..\..\Tools\Unity.CecilTools\Unity.CecilTools.csproj", "{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}"
97
EndProject
108
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "Unity.SerializationLogic", "..\..\Tools\Unity.SerializationLogic\Unity.SerializationLogic.csproj", "{A6749DFF-E369-4FE6-9019-6B7C555E80EA}"
@@ -15,16 +13,14 @@ Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEngine", "UnityEngine.
1513
EndProject
1614
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "UnityEditor", "UnityEditor.csproj", "{016C8D73-3641-47FB-8D33-7A015A7EC7DB}"
1715
EndProject
16+
Project("{840379C4-B6F5-7CA3-A826-FA675F01E79C}") = "DataContract", "..\..\Tools\PackageManager\DataContract\DataContract.csproj", "{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}"
17+
EndProject
1818
Global
1919
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2020
Debug|Any CPU = Debug|Any CPU
2121
Release|Any CPU = Release|Any CPU
2222
EndGlobalSection
2323
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.ActiveCfg = Debug|Any CPU
27-
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.Build.0 = Debug|Any CPU
2824
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2925
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
3026
{35FF4EBD-85F0-4727-8AC0-32AE4F3723D0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -45,6 +41,10 @@ Global
4541
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4642
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
4743
{016C8D73-3641-47FB-8D33-7A015A7EC7DB}.Release|Any CPU.Build.0 = Debug|Any CPU
44+
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.ActiveCfg = Debug|Any CPU
47+
{A15E35A9-22E8-4A79-B6CE-C0984062DAC6}.Release|Any CPU.Build.0 = Debug|Any CPU
4848
EndGlobalSection
4949
GlobalSection(SolutionProperties) = preSolution
5050
HideSolutionNode = FALSE

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Unity 2017.4.18f1 C# reference source code
1+
## Unity 2017.4.19f1 C# reference source code
22

33
The C# part of the Unity engine and editor source code.
44
May be used for reference purposes only.

‎Runtime/UnityAnalytics/Managed/UnityAnalytics.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99

1010
using UnityEngine.Connect;
11+
using uei = UnityEngine.Internal;
1112

1213
namespace UnityEngine.Analytics
1314
{
@@ -41,6 +42,19 @@ internal static UnityAnalyticsHandler GetUnityAnalyticsHandler()
4142
return s_UnityAnalyticsHandler;
4243
}
4344

45+
[uei.ExcludeFromDocs]
46+
public static bool initializeOnStartup
47+
{
48+
get
49+
{
50+
return UnityAnalyticsHandler.initializeOnStartup;
51+
}
52+
set
53+
{
54+
UnityAnalyticsHandler.initializeOnStartup = value;
55+
}
56+
}
57+
4458
public static bool limitUserTracking
4559
{
4660
get
@@ -82,6 +96,16 @@ public static bool enabled
8296
}
8397
}
8498

99+
[uei.ExcludeFromDocs]
100+
public static AnalyticsResult ResumeInitialization()
101+
{
102+
UnityAnalyticsHandler unityAnalyticsHandler = GetUnityAnalyticsHandler();
103+
if (unityAnalyticsHandler == null)
104+
return AnalyticsResult.NotInitialized;
105+
106+
return (AnalyticsResult)unityAnalyticsHandler.ResumeInitialization();
107+
}
108+
85109
public static AnalyticsResult FlushEvents()
86110
{
87111
UnityAnalyticsHandler unityAnalyticsHandler = GetUnityAnalyticsHandler();

‎artifacts/generated/common/modules/CloudServicesSettings/AnalyticsSettingsBindings.gen.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@ public extern static bool testMode
4141
set;
4242
}
4343

44+
[uei.ExcludeFromDocs]
45+
public extern static bool initializeOnStartup
46+
{
47+
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
48+
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
49+
get;
50+
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
51+
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
52+
set;
53+
}
54+
4455
internal extern static bool enabledForPlatform
4556
{
4657
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration

‎artifacts/generated/common/modules/UnityAnalytics/UnityAnalyticsHandlerBindings.gen.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,16 @@ public void Dispose()
5353
}
5454

5555

56+
public extern static bool initializeOnStartup
57+
{
58+
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
59+
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
60+
get;
61+
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
62+
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
63+
set;
64+
}
65+
5666
public extern static bool limitUserTracking
5767
{
5868
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
@@ -83,6 +93,10 @@ public extern bool enabled
8393
set;
8494
}
8595

96+
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
97+
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
98+
extern public AnalyticsResult ResumeInitialization () ;
99+
86100
[UnityEngine.Scripting.GeneratedByOldBindingsGeneratorAttribute] // Temporarily necessary for bindings migration
87101
[System.Runtime.CompilerServices.MethodImplAttribute((System.Runtime.CompilerServices.MethodImplOptions)0x1000)]
88102
extern public AnalyticsResult FlushEvents () ;

0 commit comments

Comments
 (0)