Merge pull request #1005 from StephenHodgson/Dev_Unity_2017.2.0

StephenHodgson · web-flow · commit c591bbb55220 · 2017-09-23T21:20:59.000-07:00
Fixed improper OnDestroy implementation
diff --git a/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs b/Assets/HoloToolkit/Utilities/Scripts/FadeScript.cs
@@ -83,7 +83,7 @@ void CalculateFade()
             }
         }
 
-        new void OnDestroy()
+        protected override void OnDestroy()
         {
             if (fadeMaterial != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ void CalculateFade()`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- new void OnDestroy()`
	`86`	`+ protected override void OnDestroy()`
`87`	`87`	`{`
`88`	`88`	`if (fadeMaterial != null)`
`89`	`89`	`{`