Merge pull request #1730 from kristianpd/fix-2018-compile

thestonefox · web-flow · commit 97cc00b4f018 · 2018-04-08T16:09:11.000+01:00
fix(Highlighters): use whiteTexture in place of new Texture
diff --git a/Assets/VRTK/Source/Scripts/Interactions/Highlighters/VRTK_MaterialColorSwapHighlighter.cs b/Assets/VRTK/Source/Scripts/Interactions/Highlighters/VRTK_MaterialColorSwapHighlighter.cs
@@ -160,7 +160,7 @@ protected virtual void ChangeToHighlightColor(Color color, float duration = 0f)
 
                     if (resetMainTexture && material.HasProperty("_MainTex"))
                     {
-                        renderer.material.SetTexture("_MainTex", new Texture());
+                        renderer.material.SetTexture("_MainTex", Texture2D.whiteTexture);
                     }
 
                     if (material.HasProperty("_Color"))

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ protected virtual void ChangeToHighlightColor(Color color, float duration = 0f)`
`160`	`160`
`161`	`161`	`if (resetMainTexture && material.HasProperty("_MainTex"))`
`162`	`162`	`{`
`163`		`- renderer.material.SetTexture("_MainTex", new Texture());`
	`163`	`+ renderer.material.SetTexture("_MainTex", Texture2D.whiteTexture);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if (material.HasProperty("_Color"))`