Merge remote-tracking branch 'snozbot/master' into keyboard-shortcuts

Assets/Fungus/EditorResources.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5ff164265158945c18b7d438b570ba22
+folderAsset: yes
+timeCreated: 1478502248
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Fungus/EditorResources/Icons/Pro.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5e5a1319ef7f546a7affe3baabd5fba6
+folderAsset: yes
+timeCreated: 1478502692
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Fungus/EditorResources/Icons/Pro/add.png.meta

@@ -1,5 +1,7 @@
 fileFormatVersion: 2
-guid: b3dd8b25a62664f379cb3714060d4e33
+guid: 4e43c476b4a7a49a08c37378fb01ce99
+timeCreated: 1478502692
+licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -15,17 +17,17 @@ TextureImporter:
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
+  cubemapConvolutionSteps: 7
   cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
-  maxTextureSize: 1024
+  maxTextureSize: 2048
   textureSettings:
     filterMode: -1
     aniso: 1
@@ -35,18 +37,22 @@ TextureImporter:
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
+  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaIsTransparency: 1
+  spriteTessellationDetail: -1
   textureType: 2
   buildTargetSettings: []
   spriteSheet:
+    serializedVersion: 2
     sprites: []
+    outline: []
   spritePackingTag: 
   userData: 
   assetBundleName: 

Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta

@@ -1,5 +1,7 @@
 fileFormatVersion: 2
-guid: c8b63a574d777374a918f2900930e540
+guid: 64534dfaa17844231a9a9dd2df89d0db
+timeCreated: 1478502692
+licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -15,17 +17,17 @@ TextureImporter:
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
+  cubemapConvolutionSteps: 7
   cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
-  maxTextureSize: 1024
+  maxTextureSize: 2048
   textureSettings:
     filterMode: -1
     aniso: 1
@@ -35,18 +37,22 @@ TextureImporter:
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
+  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaIsTransparency: 1
+  spriteTessellationDetail: -1
   textureType: 2
   buildTargetSettings: []
   spriteSheet:
+    serializedVersion: 2
     sprites: []
+    outline: []
   spritePackingTag: 
   userData: 
   assetBundleName: 

Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta

@@ -1,5 +1,7 @@
 fileFormatVersion: 2
-guid: c0a7a4711d69249ab9dae1539a3247ee
+guid: 29c4d29b1678042a5b3516c732ccc507
+timeCreated: 1478502692
+licenseType: Free
 TextureImporter:
   fileIDToRecycleName: {}
   serializedVersion: 2
@@ -15,17 +17,17 @@ TextureImporter:
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
   grayScaleToAlpha: 0
   generateCubemap: 0
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
+  cubemapConvolutionSteps: 7
   cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -3
-  maxTextureSize: 1024
+  maxTextureSize: 2048
   textureSettings:
     filterMode: -1
     aniso: 1
@@ -35,18 +37,22 @@ TextureImporter:
   lightmap: 0
   rGBM: 0
   compressionQuality: 50
+  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
+  spritePivot: {x: 0.5, y: 0.5}
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
   alphaIsTransparency: 1
+  spriteTessellationDetail: -1
   textureType: 2
   buildTargetSettings: []
   spriteSheet:
+    serializedVersion: 2
     sprites: []
+    outline: []
   spritePackingTag: 
   userData: 
   assetBundleName: 

Assets/Fungus/EditorResources/Icons/Pro/down.png.meta

@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 5a87a7d3683164a238377d948572805f
+timeCreated: 1478502692
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -3
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta

@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 2f17490d993c84bd7872ef6588ffba47
+timeCreated: 1478502692
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -3
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Fungus/EditorResources/Icons/Pro/up.png.meta

@@ -0,0 +1,59 @@
+fileFormatVersion: 2
+guid: 2a76a781db2994b33b83cd84b8835da7
+timeCreated: 1478502692
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    linearTexture: 1
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 7
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -3
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  buildTargetSettings: []
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Fungus/Scripts/Commands/End.cs

@@ -24,8 +24,10 @@ namespace Fungus
             {
                 for (int i = CommandIndex - 1; i >= 0; --i)
                 {
-                    System.Type commandType = ParentBlock.CommandList[i].GetType();
+                    var command = ParentBlock.CommandList[i];
-                    if (commandType == typeof(While))
+
+                    if (command.IndentLevel == IndentLevel &&
+                        command.GetType() == typeof(While))
                     {
                         Continue(i);
                         return;

Assets/Fungus/Scripts/Editor/BlockEditor.cs

@@ -41,11 +41,11 @@ namespace Fungus.EditorUtils
 
         protected virtual void OnEnable()
         {
-            upIcon = Resources.Load("Icons/up") as Texture2D;
+            upIcon = FungusEditorResources.Up;
-            downIcon = Resources.Load("Icons/down") as Texture2D;
+            downIcon = FungusEditorResources.Down;
-            addIcon = Resources.Load("Icons/add") as Texture2D;
+            addIcon = FungusEditorResources.Add;
-            duplicateIcon = Resources.Load("Icons/duplicate") as Texture2D;
+            duplicateIcon = FungusEditorResources.Duplicate;
-            deleteIcon = Resources.Load("Icons/delete") as Texture2D;
+            deleteIcon = FungusEditorResources.Delete;
         }
 
         public virtual void DrawBlockName(Flowchart flowchart)

Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs

@@ -213,7 +213,7 @@ namespace Fungus.EditorUtils
             string commandName = commandInfoAttr.CommandName;
             
             GUIStyle commandLabelStyle = new GUIStyle(GUI.skin.box);
-            commandLabelStyle.normal.background = FungusEditorResources.texCommandBackground;
+            commandLabelStyle.normal.background = FungusEditorResources.CommandBackground;
             int borderSize = 5;
             commandLabelStyle.border.top = borderSize;
             commandLabelStyle.border.bottom = borderSize;
@@ -420,7 +420,7 @@ namespace Fungus.EditorUtils
                 alpha = Mathf.Clamp01(alpha);
 
                 GUI.color = new Color(1f, 1f, 1f, alpha);
-                GUI.Label(iconRect, FungusEditorResources.texPlaySmall, new GUIStyle());
+                GUI.Label(iconRect, FungusEditorResources.PlaySmall, new GUIStyle());
 
                 GUI.color = storeColor;
             }

Assets/Fungus/Scripts/Editor/FlowchartEditor.cs

@@ -50,7 +50,7 @@ namespace Fungus.EditorUtils
             luaEnvironmentProp = serializedObject.FindProperty("luaEnvironment");
             luaBindingNameProp = serializedObject.FindProperty("luaBindingName");
 
-            addTexture = Resources.Load("Icons/add_small") as Texture2D;
+            addTexture = FungusEditorResources.AddSmall;
         }
 
         public override void OnInspectorGUI() 

Assets/Fungus/Scripts/Editor/FlowchartWindow.cs

@@ -150,7 +150,7 @@ namespace Fungus.EditorUtils
             nodeStyle.alignment = TextAnchor.MiddleCenter;
             nodeStyle.wordWrap = true;
 
-            addTexture = Resources.Load("Icons/add_small") as Texture2D;
+            addTexture = FungusEditorResources.AddSmall;
             copyList.Clear();
         }
 
@@ -564,7 +564,7 @@ namespace Fungus.EditorUtils
                             GUI.color = new Color(1f, 1f, 1f, alpha); 
                         }
 
-                        if (GUI.Button(rect, FungusEditorResources.texPlayBig as Texture, new GUIStyle()))
+                        if (GUI.Button(rect, FungusEditorResources.PlayBig, new GUIStyle()))
                         {
                             SelectBlock(flowchart, b);
                         }
@@ -958,8 +958,8 @@ namespace Fungus.EditorUtils
 
             if (block._EventHandler != null)
             {
-                offTex = FungusEditorResources.texEventNodeOff;
+                offTex = FungusEditorResources.EventNodeOff;
-                onTex = FungusEditorResources.texEventNodeOn;
+                onTex = FungusEditorResources.EventNodeOn;
                 defaultColor = FungusConstants.DefaultEventBlockTint;
             }
             else
@@ -979,14 +979,14 @@ namespace Fungus.EditorUtils
 
                 if (uniqueList.Count > 1)
                 {
-                    offTex = FungusEditorResources.texChoiceNodeOff;
+                    offTex = FungusEditorResources.ChoiceNodeOff;
-                    onTex = FungusEditorResources.texChoiceNodeOn;
+                    onTex = FungusEditorResources.ChoiceNodeOn;
                     defaultColor = FungusConstants.DefaultChoiceBlockTint;
                 }
                 else
                 {
-                    offTex = FungusEditorResources.texProcessNodeOff;
+                    offTex = FungusEditorResources.ProcessNodeOff;
-                    onTex = FungusEditorResources.texProcessNodeOn;
+                    onTex = FungusEditorResources.ProcessNodeOn;
                     defaultColor = FungusConstants.DefaultProcessBlockTint;
                 }
             }

Assets/Fungus/Scripts/Editor/FungusEditorResources.cs

@@ -1,149 +1,115 @@
 // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
 // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
 
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
 
-namespace Fungus.EditorUtils 
+namespace Fungus.EditorUtils
 {
-    internal static class FungusEditorResources 
+    internal static partial class FungusEditorResources
     {
-
+        private static Dictionary<string, Texture2D> textures = new Dictionary<string, Texture2D>();
-        static FungusEditorResources() {
+        private static readonly string editorResourcesFolderName = "\"EditorResources\"";
-            GenerateSpecialTextures();
-            LoadResourceAssets();
-        }
-
-        private enum ResourceName 
-        {
-            command_background = 0,
-            choice_node_off,
-            choice_node_on,
-            process_node_off,
-            process_node_on,
-            event_node_off,
-            event_node_on,
-            play_big,
-            play_small
-        }
         
-        private static string[] s_LightSkin = {
+        static FungusEditorResources()
-            "command_background",
-            "choice_node_off",
-            "choice_node_on",
-            "process_node_off",
-            "process_node_on",
-            "event_node_off",
-            "event_node_on",
-            "play_big",
-            "play_small"
-        };
-
-        private static string[] s_DarkSkin = {
-            "command_background",
-            "choice_node_off",
-            "choice_node_on",
-            "process_node_off",
-            "process_node_on",
-            "event_node_off",
-            "event_node_on",
-            "play_big",
-            "play_small"
-        };
-
-        public static Texture2D texCommandBackground 
         {
-            get { return s_Cached[(int)ResourceName.command_background]; }
+            LoadTexturesFromNames();
         }
 
-        public static Texture2D texEventNodeOn
+        private static void LoadTexturesFromNames()
         {
-            get { return s_Cached[(int)ResourceName.event_node_on]; }
+            var baseDirectories = AssetDatabase.FindAssets(editorResourcesFolderName).Select(
-        }
+                guid => AssetDatabase.GUIDToAssetPath(guid)
-        
+            ).ToArray();
-        public static Texture2D texEventNodeOff
+            
-        {
+            foreach (var name in resourceNames)
-            get { return s_Cached[(int)ResourceName.event_node_off]; }
+            {
+                LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories));
+            }
         }
 
-        public static Texture2D texProcessNodeOn
+        private static void LoadAllTexturesInFolder()
-        {
-            get { return s_Cached[(int)ResourceName.process_node_on]; }
-        }
-        
-        public static Texture2D texProcessNodeOff
         {
-            get { return s_Cached[(int)ResourceName.process_node_off]; }
+            var rootGuid = AssetDatabase.FindAssets(editorResourcesFolderName)[0];
+            var root = AssetDatabase.GUIDToAssetPath(rootGuid);
+            LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root }));
         }
 
-        public static Texture2D texChoiceNodeOn
+        private static void LoadTexturesFromGUIDs(string[] guids)
         {
-            get { return s_Cached[(int)ResourceName.choice_node_on]; }
+            var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/"));
-        }
+            
-        
+            foreach (var path in paths)
-        public static Texture2D texChoiceNodeOff
+            {
-        {
+                if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin)
-            get { return s_Cached[(int)ResourceName.choice_node_off]; }
+                {
+                    return;
+                }
+                var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D;
+                textures[texture.name] = texture;
+            }
         }
 
-        public static Texture2D texPlayBig
+        [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")]
+        private static void GenerateResourcesScript()
         {
-            get { return s_Cached[(int)ResourceName.play_big]; }
+            textures.Clear();
-        }
+            LoadAllTexturesInFolder();
 
-        public static Texture2D texPlaySmall
+            var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0];
-        {
+            var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs");
-            get { return s_Cached[(int)ResourceName.play_small]; }
+            var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length);
-        }
+            
+            using (var writer = new StreamWriter(absolutePath))
+            {
+                writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).");
+                writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)");
+                writer.WriteLine("");				
+                writer.WriteLine("using UnityEngine;");
+                writer.WriteLine("");
+                writer.WriteLine("namespace Fungus.EditorUtils");
+                writer.WriteLine("{");
+                writer.WriteLine("    internal static partial class FungusEditorResources");
+                writer.WriteLine("    {");
+                writer.WriteLine("        private static readonly string[] resourceNames = new [] {");
+                
+                foreach (var pair in textures)
+                {
+                    writer.WriteLine("            \"" + pair.Key + "\",");
+                }
 
-        public static Texture2D texItemSplitter { get; private set; }
+                writer.WriteLine("        };");
-        
+                writer.WriteLine("");
-        private static void GenerateSpecialTextures() 
+
-        {
+                foreach (var pair in textures)
-            var splitterColor = EditorGUIUtility.isProSkin
+                {
-                ? new Color(1f, 1f, 1f, 0.14f)
+                    var name = pair.Key;
-                    : new Color(0.59f, 0.59f, 0.59f, 0.55f)
+                    var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select(
-                    ;
+                        s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray()
-            texItemSplitter = CreatePixelTexture("(Generated) Item Splitter", splitterColor);
+                    );
-        }
+                    writer.WriteLine("        public static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }");
-        
+                }
-        public static Texture2D CreatePixelTexture(string name, Color color) 
+
-        {
+                writer.WriteLine("    }");
-            var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false, true);
+                writer.WriteLine("}");
-            tex.name = name;
+            }
-            tex.hideFlags = HideFlags.HideAndDontSave;
+
-            tex.filterMode = FilterMode.Point;
+            AssetDatabase.ImportAsset(relativePath);
-            tex.SetPixel(0, 0, color);
-            tex.Apply();
-            return tex;
         }
 
-        private static Texture2D[] s_Cached;
+        private static Texture2D GetTexture(string name)
-        
-        public static void LoadResourceAssets() 
         {
-            var skin = EditorGUIUtility.isProSkin ? s_DarkSkin : s_LightSkin;
+            Texture2D texture;
-            s_Cached = new Texture2D[skin.Length];
+            if (!textures.TryGetValue(name, out texture))
-            
-            for (int i = 0; i < s_Cached.Length; ++i)
             {
-                s_Cached[i] = Resources.Load("Textures/" + skin[i]) as Texture2D;
+                Debug.LogWarning("Texture \"" + name + "\" not found!");
             }
             
-            s_LightSkin = null;
+            return texture;
-            s_DarkSkin = null;
-        }
-        
-        private static void GetImageSize(byte[] imageData, out int width, out int height) 
-        {
-            width = ReadInt(imageData, 3 + 15);
-            height = ReadInt(imageData, 3 + 15 + 2 + 2);
-        }
-        
-        private static int ReadInt(byte[] imageData, int offset) 
-        {
-            return (imageData[offset] << 8) | imageData[offset + 1];
         }
     }
-}
+}

Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs

@@ -0,0 +1,44 @@
+// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
+// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
+
+using UnityEngine;
+
+namespace Fungus.EditorUtils
+{
+    internal static partial class FungusEditorResources
+    {
+        private static readonly string[] resourceNames = new [] {
+            "add",
+            "add_small",
+            "delete",
+            "down",
+            "duplicate",
+            "up",
+            "choice_node_off",
+            "choice_node_on",
+            "command_background",
+            "event_node_off",
+            "event_node_on",
+            "play_big",
+            "play_small",
+            "process_node_off",
+            "process_node_on",
+        };
+
+        public static Texture2D Add { get { return GetTexture("add"); } }
+        public static Texture2D AddSmall { get { return GetTexture("add_small"); } }
+        public static Texture2D Delete { get { return GetTexture("delete"); } }
+        public static Texture2D Down { get { return GetTexture("down"); } }
+        public static Texture2D Duplicate { get { return GetTexture("duplicate"); } }
+        public static Texture2D Up { get { return GetTexture("up"); } }
+        public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } }
+        public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } }
+        public static Texture2D CommandBackground { get { return GetTexture("command_background"); } }
+        public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } }
+        public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } }
+        public static Texture2D PlayBig { get { return GetTexture("play_big"); } }
+        public static Texture2D PlaySmall { get { return GetTexture("play_small"); } }
+        public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } }
+        public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } }
+    }
+}

Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f5119f9bdde234916bed657bdc751f76
+timeCreated: 1478502142
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Tests/Scripting/Scripting.unity

@@ -163,6 +163,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 115525222}
+  waitForFrames: 1
 --- !u!114 &115525222
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -181,6 +182,8 @@ MonoBehaviour:
     y: 70
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -212,7 +215,7 @@ MonoBehaviour:
     y: -340
     width: 1114
     height: 859
-  selectedBlock: {fileID: 115525222}
+  selectedBlocks: []
   selectedCommands: []
   variables: []
   description: 
@@ -301,6 +304,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 169310214}
+  waitForFrames: 1
 --- !u!114 &169310214
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -319,6 +323,8 @@ MonoBehaviour:
     y: 69
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -350,7 +356,7 @@ MonoBehaviour:
     y: -350
     width: 1126
     height: 869
-  selectedBlock: {fileID: 0}
+  selectedBlocks: []
   selectedCommands: []
   variables: []
   description: If none of the other Flowcharts have Failed then this one will succeed
@@ -404,7 +410,7 @@ MonoBehaviour:
     y: -340
     width: 1114
     height: 859
-  selectedBlock: {fileID: 0}
+  selectedBlocks: []
   selectedCommands: []
   variables:
   - {fileID: 178675537}
@@ -690,6 +696,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 265055379}
+  waitForFrames: 1
 --- !u!114 &265055379
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -707,6 +714,8 @@ MonoBehaviour:
     y: 70
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 1
   blockName: BlockB
   description: The block that does the stopping
@@ -733,6 +742,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 265055381}
+  waitForFrames: 1
 --- !u!114 &265055381
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -751,6 +761,8 @@ MonoBehaviour:
     y: 70
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: BlockA
   description: The block to be stopped
@@ -782,7 +794,7 @@ MonoBehaviour:
     y: -350
     width: 1121
     height: 869
-  selectedBlock: {fileID: 265055379}
+  selectedBlocks: []
   selectedCommands: []
   variables:
   - {fileID: 265055376}
@@ -890,7 +902,7 @@ MonoBehaviour:
     y: -340
     width: 1114
     height: 892
-  selectedBlock: {fileID: 396492930}
+  selectedBlocks: []
   selectedCommands:
   - {fileID: 396492940}
   variables:
@@ -967,6 +979,8 @@ MonoBehaviour:
     y: 111
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -1035,6 +1049,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 396492930}
+  waitForFrames: 1
 --- !u!114 &396492934
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1357,6 +1372,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 491823362}
+  waitForFrames: 1
 --- !u!114 &491823362
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1375,6 +1391,8 @@ MonoBehaviour:
     y: 70
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -1412,7 +1430,8 @@ MonoBehaviour:
     y: -340
     width: 1114
     height: 859
-  selectedBlock: {fileID: 491823362}
+  selectedBlocks:
+  - {fileID: 491823362}
   selectedCommands: []
   variables:
   - {fileID: 491823359}
@@ -1523,6 +1542,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 575910004}
+  waitForFrames: 1
 --- !u!114 &575910004
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1540,6 +1560,8 @@ MonoBehaviour:
     y: 75
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 2
   blockName: New Block
   description: 
@@ -1585,6 +1607,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 575910007}
+  waitForFrames: 1
 --- !u!114 &575910007
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1603,6 +1626,8 @@ MonoBehaviour:
     y: 69
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -1634,7 +1659,7 @@ MonoBehaviour:
     y: -350
     width: 1126
     height: 869
-  selectedBlock: {fileID: 575910007}
+  selectedBlocks: []
   selectedCommands: []
   variables: []
   description: Test if interupting a Say command works
@@ -1763,6 +1788,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 590474778}
+  waitForFrames: 1
 --- !u!114 &590474778
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1780,6 +1806,8 @@ MonoBehaviour:
     y: 75
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 2
   blockName: New Block
   description: 
@@ -1800,6 +1828,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 590474780}
+  waitForFrames: 1
 --- !u!114 &590474780
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1818,6 +1847,8 @@ MonoBehaviour:
     y: 69
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -1850,7 +1881,7 @@ MonoBehaviour:
     y: -350
     width: 1126
     height: 869
-  selectedBlock: {fileID: 590474780}
+  selectedBlocks: []
   selectedCommands:
   - {fileID: 590474773}
   variables: []
@@ -1933,6 +1964,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 636123607}
+  waitForFrames: 1
 --- !u!114 &636123607
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -1951,6 +1983,8 @@ MonoBehaviour:
     y: 69
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -1983,7 +2017,7 @@ MonoBehaviour:
     y: -350
     width: 1126
     height: 869
-  selectedBlock: {fileID: 636123607}
+  selectedBlocks: []
   selectedCommands:
   - {fileID: 636123614}
   variables: []
@@ -2054,6 +2088,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 636123613}
+  waitForFrames: 1
 --- !u!114 &636123613
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -2071,6 +2106,8 @@ MonoBehaviour:
     y: 75
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 2
   blockName: New Block
   description: 
@@ -2152,7 +2189,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  selectedFlowchart: {fileID: 178675536}
+  selectedFlowchart: {fileID: 675090867}
 --- !u!4 &646902075
 Transform:
   m_ObjectHideFlags: 1
@@ -2166,6 +2203,455 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!1 &675090853
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 675090854}
+  - 114: {fileID: 675090867}
+  - 114: {fileID: 675090866}
+  - 114: {fileID: 675090865}
+  - 114: {fileID: 675090864}
+  - 114: {fileID: 675090863}
+  - 114: {fileID: 675090862}
+  - 114: {fileID: 675090861}
+  - 114: {fileID: 675090860}
+  - 114: {fileID: 675090859}
+  - 114: {fileID: 675090858}
+  - 114: {fileID: 675090857}
+  - 114: {fileID: 675090856}
+  - 114: {fileID: 675090873}
+  - 114: {fileID: 675090872}
+  - 114: {fileID: 675090871}
+  - 114: {fileID: 675090870}
+  - 114: {fileID: 675090869}
+  - 114: {fileID: 675090868}
+  - 114: {fileID: 675090855}
+  m_Layer: 0
+  m_Name: Flowchart
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &675090854
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 1220349165}
+  m_RootOrder: 0
+--- !u!114 &675090855
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 15
+  indentLevel: 0
+--- !u!114 &675090856
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 7
+  indentLevel: 1
+  variable: {fileID: 675090859}
+  setOperator: 0
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 0
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090857
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 6
+  indentLevel: 2
+  variable: {fileID: 675090859}
+  setOperator: 2
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 1
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090858
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 5
+  indentLevel: 1
+  variable: {fileID: 675090860}
+  setOperator: 2
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 1
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090859
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scope: 0
+  key: j
+  value: 0
+--- !u!114 &675090860
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scope: 0
+  key: i
+  value: 0
+--- !u!114 &675090861
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 4
+  indentLevel: 0
+--- !u!114 &675090862
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 663c8a7831a104d16ad7078a4dc2bd10, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 3
+  indentLevel: 1
+  compareOperator: 2
+  variable: {fileID: 675090859}
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 3
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090863
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 2
+  indentLevel: 1
+--- !u!114 &675090864
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 663c8a7831a104d16ad7078a4dc2bd10, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 1
+  indentLevel: 0
+  compareOperator: 2
+  variable: {fileID: 675090860}
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 3
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090865
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  parentBlock: {fileID: 675090866}
+  waitForFrames: 1
+--- !u!114 &675090866
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nodeRect:
+    serializedVersion: 2
+    x: 67
+    y: 70
+    width: 120
+    height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
+  itemId: 0
+  blockName: Start
+  description: 
+  eventHandler: {fileID: 675090865}
+  commandList:
+  - {fileID: 675090864}
+  - {fileID: 675090856}
+  - {fileID: 675090858}
+  - {fileID: 675090862}
+  - {fileID: 675090857}
+  - {fileID: 675090863}
+  - {fileID: 675090861}
+  - {fileID: 675090873}
+  - {fileID: 675090871}
+  - {fileID: 675090872}
+  - {fileID: 675090870}
+  - {fileID: 675090869}
+  - {fileID: 675090868}
+  - {fileID: 675090855}
+--- !u!114 &675090867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a,
+    type: 2}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 1
+  scrollPos: {x: 0, y: 0}
+  variablesScrollPos: {x: 0, y: 0}
+  variablesExpanded: 1
+  blockViewHeight: 400
+  zoom: 1
+  scrollViewRect:
+    serializedVersion: 2
+    x: -343
+    y: -340
+    width: 1114
+    height: 859
+  selectedBlocks: []
+  selectedCommands: []
+  variables:
+  - {fileID: 675090860}
+  - {fileID: 675090859}
+  description: Check if nested while loops work correctly
+  stepPause: 0
+  colorCommands: 1
+  hideComponents: 1
+  saveSelection: 1
+  localizationId: 
+  showLineNumbers: 0
+  hideCommands: []
+  luaEnvironment: {fileID: 0}
+  luaBindingName: flowchart
+--- !u!114 &675090868
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 14
+  indentLevel: 0
+--- !u!114 &675090869
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 13
+  indentLevel: 1
+  failMessage: 
+--- !u!114 &675090870
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 12
+  indentLevel: 0
+  compareOperator: 1
+  variable: {fileID: 675090859}
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 3
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
+--- !u!114 &675090871
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 11
+  indentLevel: 1
+  failMessage: 
+--- !u!114 &675090872
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 10
+  indentLevel: 0
+--- !u!114 &675090873
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 675090853}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 9
+  indentLevel: 0
+  compareOperator: 1
+  variable: {fileID: 675090860}
+  booleanData:
+    booleanRef: {fileID: 0}
+    booleanVal: 0
+  integerData:
+    integerRef: {fileID: 0}
+    integerVal: 3
+  floatData:
+    floatRef: {fileID: 0}
+    floatVal: 0
+  stringData:
+    stringRef: {fileID: 0}
+    stringVal: 
 --- !u!1 &676156674
 GameObject:
   m_ObjectHideFlags: 0
@@ -2613,6 +3099,57 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1141004796}
+--- !u!1 &1220349163
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 1220349165}
+  - 114: {fileID: 1220349164}
+  m_Layer: 0
+  m_Name: NestedWhileTest
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1220349164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1220349163}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  timeout: 5
+  ignored: 0
+  succeedAfterAllAssertionsAreExecuted: 0
+  expectException: 0
+  expectedExceptionList: 
+  succeedWhenExceptionIsThrown: 0
+  includedPlatforms: -1
+  platformsToIgnore: []
+  dynamic: 0
+  dynamicTypeName: 
+--- !u!4 &1220349165
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1220349163}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 675090854}
+  m_Father: {fileID: 0}
+  m_RootOrder: 12
 --- !u!1 &1314799789
 GameObject:
   m_ObjectHideFlags: 0
@@ -2628,7 +3165,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1314799790
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2892,7 +3429,7 @@ MonoBehaviour:
     y: -351
     width: 1161
     height: 873
-  selectedBlock: {fileID: 1618689131}
+  selectedBlocks: []
   selectedCommands:
   - {fileID: 1618689150}
   variables:
@@ -3022,6 +3559,8 @@ MonoBehaviour:
     y: 69
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Test Invoke
   description: 
@@ -3050,6 +3589,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 1618689131}
+  waitForFrames: 1
 --- !u!4 &1618689133
 Transform:
   m_ObjectHideFlags: 0
@@ -3427,6 +3967,8 @@ MonoBehaviour:
     y: 68
     width: 156
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 11
   blockName: Test Delayed Invoke
   description: This block gets executed by last command in Test Invoke
@@ -3664,7 +4206,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  remoteDebugger: 0
 --- !u!114 &1753646198
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4103,6 +4644,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   parentBlock: {fileID: 1982550313}
+  waitForFrames: 1
 --- !u!114 &1982550313
 MonoBehaviour:
   m_ObjectHideFlags: 2
@@ -4121,6 +4663,8 @@ MonoBehaviour:
     y: 70
     width: 120
     height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
   itemId: 0
   blockName: Start
   description: 
@@ -4156,7 +4700,7 @@ MonoBehaviour:
     y: -340
     width: 1114
     height: 859
-  selectedBlock: {fileID: 1982550313}
+  selectedBlocks: []
   selectedCommands: []
   variables:
   - {fileID: 1982550310}