[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20786] tags/blender-2.49-release/source/ blender/src/booleanops.c: Revert commit 20743: should have been made into trunk, not tagged branch.

[Ken Hughes]

Revision: 20786
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20786
Author:   khughes
Date:     2009-06-10 17:56:38 +0200 (Wed, 10 Jun 2009)

Log Message:
-----------
Revert commit 20743: should have been made into trunk, not tagged branch.

Modified Paths:
--------------
    tags/blender-2.49-release/source/blender/src/booleanops.c

Modified: tags/blender-2.49-release/source/blender/src/booleanops.c
===================================================================
--- tags/blender-2.49-release/source/blender/src/booleanops.c   2009-06-10 
15:13:05 UTC (rev 20785)
+++ tags/blender-2.49-release/source/blender/src/booleanops.c   2009-06-10 
15:56:38 UTC (rev 20786)
@@ -164,7 +164,6 @@
        DerivedMesh *dm;
        int pos;
        int offset;
-       int flip;
 } FaceIt;
 
 static void FaceIt_Destruct(CSG_FaceIteratorDescriptor * iterator)
@@ -191,15 +190,9 @@
        MFace *mfaces = face_it->dm->getFaceArray(face_it->dm);
        MFace *mface = &mfaces[face_it->pos];
 
-       /* reverse face vertices if necessary */
+       face->vertex_index[0] = mface->v1;
        face->vertex_index[1] = mface->v2;
-       if( face_it->flip == 0 ) {
-               face->vertex_index[0] = mface->v1;
-               face->vertex_index[2] = mface->v3;
-       } else {
-               face->vertex_index[2] = mface->v1;
-               face->vertex_index[0] = mface->v3;
-       }
+       face->vertex_index[2] = mface->v3;
        if (mface->v4) {
                face->vertex_index[3] = mface->v4;
                face->vertex_number = 4;
@@ -223,7 +216,7 @@
 }      
 
 static void FaceIt_Construct(
-       CSG_FaceIteratorDescriptor *output, DerivedMesh *dm, int offset, Object 
*ob)
+       CSG_FaceIteratorDescriptor *output, DerivedMesh *dm, int offset)
 {
        FaceIt *it;
        if (output == 0) return;
@@ -238,25 +231,6 @@
        it->offset = offset;
        it->pos = 0;
 
-       /* determine if we will need to reverse order of face vertices */
-       if (ob->size[0] < 0.0f) {
-               if (ob->size[1] < 0.0f && ob->size[2] < 0.0f) {
-                       it->flip = 1;
-               } else if (ob->size[1] >= 0.0f && ob->size[2] >= 0.0f) {
-                       it->flip = 1;
-               } else {
-                       it->flip = 0;
-               }
-       } else {
-               if (ob->size[1] < 0.0f && ob->size[2] < 0.0f) {
-                       it->flip = 0;
-               } else if (ob->size[1] >= 0.0f && ob->size[2] >= 0.0f) {
-                       it->flip = 0;
-               } else {
-                       it->flip = 1;
-               }
-       }
-
        // assign iterator function pointers.
        output->Step = FaceIt_Step;
        output->Fill = FaceIt_Fill;
@@ -455,7 +429,7 @@
        struct CSG_VertexIteratorDescriptor * vertex_it)
 {
        VertexIt_Construct(vertex_it,dm, ob);
-       FaceIt_Construct(face_it,dm,face_offset,ob);
+       FaceIt_Construct(face_it,dm,face_offset);
 }
        
 static void FreeMeshDescriptors(


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs