Merge branch 'master' into fixes/project-window-interface-initialized

StanleyGoldman · web-flow · commit 8abcbbb163c2 · 2018-10-03T07:50:17.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs
@@ -32,6 +32,10 @@ public bool Initialized
 
         static ExtensionLoader()
         {
+            if (Environment.GetEnvironmentVariable("GITHUB_UNITY_DISABLE") == "1")
+            {
+                return;
+            }
             EditorApplication.update += Initialize;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ public bool Initialized`
`32`	`32`
`33`	`33`	`static ExtensionLoader()`
`34`	`34`	`{`
	`35`	`+ if (Environment.GetEnvironmentVariable("GITHUB_UNITY_DISABLE") == "1")`
	`36`	`+ {`
	`37`	`+ return;`
	`38`	`+ }`
`35`	`39`	`EditorApplication.update += Initialize;`
`36`	`40`	`}`
`37`	`41`