Merge pull request #237 from ZdenekM/master

Various stuff
robofit · Apr 14, 2022 · 274d8b0 · 274d8b0
2 parents e03462c + 201b40e
commit 274d8b0
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 839 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 [Bb]uilds/
 [Ll]ogs/
 [Mm]emoryCaptures/
+/[Uu]ser[Ss]ettings/
 /arcor2_AREditor/[Aa]ssets/[Ss]ubmodules*
 
 # Never ignore Asset meta data

diff --git a/arcor2_AREditor/Assets/BASE/Scripts/ProjectManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/ProjectManager.cs
@@ -985,8 +985,10 @@ public void EnableAllActions(bool enable) {
                 foreach (Action action in ap.Actions.Values)
                     action.Enable(enable);
             }
-            StartAction.Enable(enable);
-            EndAction.Enable(enable);
+            if (StartAction != null)
+                StartAction.Enable(enable);
+            if (EndAction != null)
+                EndAction.Enable(enable);
         }
 
         /// <summary>

diff --git a/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset b/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset