From 806c170470934c78aeb45c909f6fcf15f0e77eb3 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Tue, 2 Sep 2014 15:21:26 +0100 Subject: [PATCH] Renamed selectedCommandIndex --- .../FungusScript/Editor/FungusScriptEditor.cs | 4 ++-- .../FungusScript/Scripts/FungusScript.cs | 2 +- Assets/Shuttle/ShuttleGame.unity | Bin 117004 -> 117020 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs index eba66a00..f420a33f 100644 --- a/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs +++ b/Assets/Fungus/FungusScript/Editor/FungusScriptEditor.cs @@ -139,12 +139,12 @@ namespace Fungus.Script } } - int selectedCommandIndex = EditorGUILayout.Popup(fungusScript.selectedCommandIndex, commandNames.ToArray()); + int selectedCommandIndex = EditorGUILayout.Popup(fungusScript.selectedAddCommandIndex, commandNames.ToArray()); if (EditorGUI.EndChangeCheck()) { Undo.RecordObject(fungusScript, "Select Command"); - fungusScript.selectedCommandIndex = selectedCommandIndex; + fungusScript.selectedAddCommandIndex = selectedCommandIndex; } if (selectedCommandIndex >= commandTypes.Count) diff --git a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs index e8e1dd1c..9341f09c 100644 --- a/Assets/Fungus/FungusScript/Scripts/FungusScript.cs +++ b/Assets/Fungus/FungusScript/Scripts/FungusScript.cs @@ -16,7 +16,7 @@ namespace Fungus.Script public FungusCommand copyCommand; [HideInInspector] - public int selectedCommandIndex; + public int selectedAddCommandIndex; [HideInInspector] public Vector2 scriptScrollPos; diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 4aa2de9c26e9d7b5cdc68aabede6193a2f7dccea..6a65818963c0caf74872b5205ceeabec4a3f0533 100644 GIT binary patch delta 45 zcmeB~#6D*dy8r{D4IcyJNf`zP22LQ`V52}rB$H#x=JLqhkEVGr@@_Y>VZ7A?0Q}+% A(*OVf delta 38 tcmbO;iM?kMy8r{D4L1YhNgf6U22LPbVWU7s