diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
commit | a377a7edf67869722c585086ac6ab1f295cbff87 (patch) | |
tree | 1736de08fe9174761607dce5d54a16af25eba049 /intern/boolop/intern/BOP_Interface.cpp | |
parent | 08232350d5797302e3638e69ec78657d853976aa (diff) | |
parent | b743454ce1c361e6161da8ae5f840c2befe3a081 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32300:32571soc-2010-nicolasbishop
Diffstat (limited to 'intern/boolop/intern/BOP_Interface.cpp')
-rw-r--r-- | intern/boolop/intern/BOP_Interface.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/intern/boolop/intern/BOP_Interface.cpp b/intern/boolop/intern/BOP_Interface.cpp index 99116b7d87d..ff15751b797 100644 --- a/intern/boolop/intern/BOP_Interface.cpp +++ b/intern/boolop/intern/BOP_Interface.cpp @@ -80,7 +80,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType opType, CSG_FaceIteratorDescriptor obBFaces, CSG_VertexIteratorDescriptor obBVertices) { - #ifdef DEBUG + #ifdef BOP_DEBUG cout << "BEGIN BOP_performBooleanOperation" << endl; #endif @@ -118,7 +118,7 @@ BoolOpState BOP_performBooleanOperation(BoolOpType opType, // Invert the output mesh if is required *outputMesh = BOP_exportMesh(&meshC, invertMeshC); - #ifdef DEBUG + #ifdef BOP_DEBUG cout << "END BOP_performBooleanOperation" << endl; #endif @@ -141,7 +141,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, bool invertMeshA, bool invertMeshB) { - #ifdef DEBUG + #ifdef BOP_DEBUG BOP_Chrono chrono; float t = 0.0f; float c = 0.0f; @@ -156,7 +156,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, BOP_BSPTree bspB; bspB.addMesh(meshC, *facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Create BSP " << c << endl; #endif @@ -172,7 +172,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, if ((0.25*facesB->size()) > bspA.getDeep()) BOP_meshFilter(meshC, facesB, &bspA); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "mesh Filter " << c << endl; #endif @@ -180,7 +180,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Face 2 Face BOP_Face2Face(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Face2Face " << c << endl; #endif @@ -189,7 +189,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, BOP_meshClassify(meshC,facesA,&bspB); BOP_meshClassify(meshC,facesB,&bspA); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Classification " << c << endl; #endif @@ -197,7 +197,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Process overlapped faces BOP_removeOverlappedFaces(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Remove overlap " << c << endl; #endif @@ -205,7 +205,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, // Sew two meshes BOP_sew(meshC,facesA,facesB); - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Sew " << c << endl; #endif @@ -238,7 +238,7 @@ BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC, #endif #endif - #ifdef DEBUG + #ifdef BOP_DEBUG c = chrono.stamp(); t += c; cout << "Merge faces " << c << endl; cout << "Total " << t << endl; |