Merge "Improve elbow placement when dual directed pathleg is no loner aligned"

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scenegraph / controlpoint / PipeControlPoint.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index 2d8c00b22f5c20f7e09da25b99da30db78b1662d..53a612e201179eca765af679c424c04a4c8ef601 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -289,7 +289,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
     }
        
        public void setTurnAngle(Double turnAngle) {
-               if (Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
+               if (turnAngle == null || Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
                        return;
                }
                if (this.turnAngle != null && Math.abs(this.turnAngle-turnAngle) < MathTools.NEAR_ZERO)
@@ -404,7 +404,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                                 dir.normalize();
                         Quat4d q =  getControlPointOrientationQuat(dir, angle);
                         if (reversed) {
-                                Quat4d q2 = new Quat4d();
+                               Quat4d q2 = new Quat4d();
                                q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
                                q.mulInverse(q2);
                         }
@@ -1189,9 +1189,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                }
                if (br0 != null) {
                    if (br0.getNext() == component)
-                       prev.setNext(null);
+                       br0.setNext(null);
                    else if (br0.getPrevious() == component)
-                prev.setPrevious(null);
+                       br0.setPrevious(null);
                    else if (br0.getBranch0() == component)
                        br0.setBranch0(null);
                }