EditorGUILayoutExtensions: Fixes error when we want to display a blank field.

Stephen Hodgson · Stephen Hodgson · commit 0c1e3bbf6b61 · 2016-12-20T11:48:04.000-05:00
diff --git a/Assets/HoloToolkit/Utilities/Editor/EditorGUILayoutExtensions.cs b/Assets/HoloToolkit/Utilities/Editor/EditorGUILayoutExtensions.cs
@@ -44,6 +44,12 @@ public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneOb
         {
             object objValue = value;
 
+            if (objValue == null)
+            {
+                // We want to return null so we can dispay our blank field.
+                return (T)objValue;
+            }
+
             Type valueType = objValue.GetType();
             if (valueType == typeof(Material))
             {

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,12 @@ public static T ObjectField<T>(GUIContent guiContent, T value, bool allowSceneOb`
`44`	`44`	`{`
`45`	`45`	`object objValue = value;`
`46`	`46`
	`47`	`+ if (objValue == null)`
	`48`	`+ {`
	`49`	`+ // We want to return null so we can dispay our blank field.`
	`50`	`+ return (T)objValue;`
	`51`	`+ }`
	`52`	`+`
`47`	`53`	`Type valueType = objValue.GetType();`
`48`	`54`	`if (valueType == typeof(Material))`
`49`	`55`	`{`