diff --git a/src/traversal/traversal_node_setup.h b/src/traversal/traversal_node_setup.h index 4dc10681a4f065b43e025df4483083cfb25d159c..6c50a0e72616b103218a83831e267c90f9afb6c2 100644 --- a/src/traversal/traversal_node_setup.h +++ b/src/traversal/traversal_node_setup.h @@ -62,7 +62,7 @@ inline bool initialize(OcTreeCollisionTraversalNode& node, const OcTree& model2, const Transform3f& tf2, const OcTreeSolver* otsolver, CollisionResult& result) - +{ node.result = &result; node.model1 = &model1; diff --git a/src/traversal/traversal_recurse.cpp b/src/traversal/traversal_recurse.cpp index 14a232cdb9d88a8e74c78baad97eabf7c12840a5..0a139b35f0c08230fd61740d54248ecffa41f2c2 100644 --- a/src/traversal/traversal_recurse.cpp +++ b/src/traversal/traversal_recurse.cpp @@ -89,7 +89,6 @@ void collisionRecurse(CollisionTraversalNodeBase* node, int b1, int b2, collisionRecurse(node, b1, c2, front_list, sqrDistLowerBound2); sqrDistLowerBound = std::min (sqrDistLowerBound1, sqrDistLowerBound2); } - return; } void collisionNonRecurse(CollisionTraversalNodeBase* node,