From 1348121c18cc842f67fb974e85e02d4abbb677b7 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Thu, 7 Aug 2014 11:21:44 +0100 Subject: [PATCH] Added BeginProperty / EndProperty to Variable Property Drawer --- .../Editor/FungusScript/FungusScriptEditor.cs | 4 ++++ Assets/Shuttle/ShuttleGame.unity | Bin 77860 -> 77868 bytes 2 files changed, 4 insertions(+) diff --git a/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs b/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs index 767c9bcc..fcb39251 100644 --- a/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs +++ b/Assets/Fungus/Editor/FungusScript/FungusScriptEditor.cs @@ -14,6 +14,8 @@ namespace Fungus.Script { public override void OnGUI (Rect position, SerializedProperty property, GUIContent label) { + EditorGUI.BeginProperty(position, label, property); + SerializedProperty keyProp = property.FindPropertyRelative("key"); SerializedProperty typeProp = property.FindPropertyRelative("type"); SerializedProperty scopeProp = property.FindPropertyRelative("scope"); @@ -50,6 +52,8 @@ namespace Fungus.Script typeProp.enumValueIndex = typeValue; scopeProp.enumValueIndex = scopeValue; } + + EditorGUI.EndProperty(); } } diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index e80b8d6bffa755b809b116f63cfa7af278d371d8..428debebad532dc0b5c333a546c9b8c088f87269 100644 GIT binary patch delta 413 zcmZ4TfMv}C77hl6PZbP|209x#c;5Q9FfcIu{r~@e5s-ea_&jQXHUmQjko^@Z_5vuz zp~JwCf+Y45C{_Rzs{o4qfvS526nil_@vX3Jf-VC?4w7ods|<-3Kw?Y`3@@1>IMr)H zvV#Ew0|$~=<_m{HkI5T>CR{LLU2F%Iq;n@mJ5X~-YH^8Y9>_5e0Q3V20I8eY^HXKIgB+s`CrB1#CDY`E gKb1j32Gbu1F>)|6POp_?)SfKxgJrvbJfnyp05<7*UH||9 delta 375 zcmZ4UfMv-877hl6PZbP|1}Ymlc;5QfFfcIu{r~@e5s-ea_&jQcHUmQjko^@Z_5vuz zpo1#*5-64d6srKL`vXCuf!y#J>V{mPn80Ml zcfz(ECJYQNK$(9~8O0|X3oii0Vu50eP^<(LGcZN9Nf{{CF*)#^Fyo8Osqg$Xrkf}* ziflh2#;CzQ=_ki@1vy5J>84VQ){}m+PTwHMXfVA(j**8IXdnaQ^gOg2ERpRh@{AmU0H8o~1^@s6