Merge pull request #2830 from keveleigh/ShaderGUINamespace

David Kline · web-flow · commit 606f336ba42d · 2018-09-24T15:39:51.000-07:00
Update MRTKStandard shader's reference to its custom inspector
diff --git a/Assets/MixedRealityToolkit/_Core/Resources/Shaders/MixedRealityStandard.shader b/Assets/MixedRealityToolkit/_Core/Resources/Shaders/MixedRealityStandard.shader
@@ -738,5 +738,5 @@ Shader "Mixed Reality Toolkit/Standard"
     }
     
     FallBack "VertexLit"
-    CustomEditor "Microsoft.MixedReality.Toolkit.Inspectors.MixedRealityStandardShaderGUI"
+    CustomEditor "Microsoft.MixedReality.Toolkit.Core.Inspectors.MixedRealityStandardShaderGUI"
 }

Original file line number	Diff line number	Diff line change
`@@ -738,5 +738,5 @@ Shader "Mixed Reality Toolkit/Standard"`
`738`	`738`	`}`
`739`	`739`
`740`	`740`	`FallBack "VertexLit"`
`741`		`- CustomEditor "Microsoft.MixedReality.Toolkit.Inspectors.MixedRealityStandardShaderGUI"`
	`741`	`+ CustomEditor "Microsoft.MixedReality.Toolkit.Core.Inspectors.MixedRealityStandardShaderGUI"`
`742`	`742`	`}`