Skip to content

Commit 7575865

Browse files
committed
skip null enteries
1 parent 1e5a69a commit 7575865

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ public static int applyToAllConstituantElements(boolean addRet, String targetNam
641641
immutable.addAll(back);
642642
for (int i = 0; i < immutable.size(); i++) {
643643
CSG csg = immutable.get(i);
644-
if (csg.isLock())
644+
if ( csg==null || csg.isLock())
645645
continue;
646646
// boolean inGroup = csg.isInGroup();
647647
boolean thisCSGIsInGroupNamedAfterTarget = csg.checkGroupMembership(targetName);

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Group.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public List<CSG> process(List<CSG> incoming) {
4949
if (name.contentEquals(csg.getName())) {
5050
if(csg.isNoScale())
5151
noscale=true;
52-
if(csg.isMotionLock() || csg.isInGroup())
52+
if(csg.isMotionLock() )
5353
nomove=true;
5454
Optional<String> mobileBaseName = csg.getMobileBaseName();
5555
if(mobileBaseName.isPresent()) {

0 commit comments

Comments
 (0)