Merge branch 'master' into UnityReorderable

Assets/Fungus/Scripts/Editor/BlockEditor.cs

@@ -306,7 +306,7 @@ namespace Fungus.EditorUtils
                 }
 
                 if (commandSelectedByTextInput != null &&
-                    Event.current.keyCode == KeyCode.Return || Event.current.keyCode == KeyCode.KeypadEnter)
+                    (Event.current.keyCode == KeyCode.Return || Event.current.keyCode == KeyCode.KeypadEnter))
                 {
                     AddCommandCallback(commandSelectedByTextInput);
                     commandSelectedByTextInput = null;
@@ -1299,4 +1299,4 @@ namespace Fungus.EditorUtils
             Repaint();
         }
     }
-}
+}

Assets/Fungus/Scripts/Editor/VariableEditor.cs

@@ -211,13 +211,15 @@ namespace Fungus.EditorUtils
                 return;
             }
 
+            var origLabel = new GUIContent(label);
+
             if (EditorGUI.GetPropertyHeight(valueProp, label) > EditorGUIUtility.singleLineHeight)
             {
-                DrawMultiLineProperty(position, label, referenceProp, valueProp, flowchart);
+                DrawMultiLineProperty(position, origLabel, referenceProp, valueProp, flowchart);
             }
             else
             {
-                DrawSingleLineProperty(position, label, referenceProp, valueProp, flowchart);
+                DrawSingleLineProperty(position, origLabel, referenceProp, valueProp, flowchart);
             }
 
             EditorGUI.EndProperty();