Revision: 55805
http://sourceforge.net/p/brlcad/code/55805
Author: phoenixyjll
Date: 2013-06-20 12:37:29 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
It seems that we inappropriately prepTrims when m_removeTrimmed is false,
causing get_closest_point() to fail. Someone who wrote this code needs to check
whether this change is correct.
Modified Paths:
--------------
brlcad/trunk/src/libbrep/intersect.cpp
brlcad/trunk/src/libbrep/opennurbs_ext.cpp
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-06-19 21:04:21 UTC (rev
55804)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-06-20 12:37:29 UTC (rev
55805)
@@ -372,7 +372,11 @@
brep->AddSurface(surfaceB.Duplicate());
brep->NewFace(0);
ON_2dPoint closest_point_uv;
- brlcad::get_closest_point(closest_point_uv, brep->Face(0), pointA);
+ if (brlcad::get_closest_point(closest_point_uv, brep->Face(0), pointA) ==
false) {
+ delete brep;
+ return false;
+ }
+
delete brep;
ON_3dPoint closest_point_3d = surfaceB.PointAt(closest_point_uv.x,
closest_point_uv.y);
Modified: brlcad/trunk/src/libbrep/opennurbs_ext.cpp
===================================================================
--- brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-19 21:04:21 UTC (rev
55804)
+++ brlcad/trunk/src/libbrep/opennurbs_ext.cpp 2013-06-20 12:37:29 UTC (rev
55805)
@@ -930,7 +930,8 @@
ON_3dPoint(max)),
m_face,
u, v);
- node->prepTrims();
+ if (!m_removeTrimmed)
+ node->prepTrims();
} else {
node = new BBNode(ctree, ON_BoundingBox(ON_3dPoint(min),
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
