Skip to content

Commit 274d8b0

Browse files
authored
Merge pull request #237 from ZdenekM/master
Various stuff
2 parents e03462c + 201b40e commit 274d8b0

File tree

13 files changed

+97
-839
lines changed

13 files changed

+97
-839
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
[Bb]uilds/
1010
[Ll]ogs/
1111
[Mm]emoryCaptures/
12+
/[Uu]ser[Ss]ettings/
1213
/arcor2_AREditor/[Aa]ssets/[Ss]ubmodules*
1314

1415
# Never ignore Asset meta data

arcor2_AREditor/Assets/BASE/Scripts/ProjectManager.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -985,8 +985,10 @@ public void EnableAllActions(bool enable) {
985985
foreach (Action action in ap.Actions.Values)
986986
action.Enable(enable);
987987
}
988-
StartAction.Enable(enable);
989-
EndAction.Enable(enable);
988+
if (StartAction != null)
989+
StartAction.Enable(enable);
990+
if (EndAction != null)
991+
EndAction.Enable(enable);
990992
}
991993

992994
/// <summary>

arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset

Lines changed: 1 addition & 3 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)