[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40812] branches/bmesh/blender/source/ blender: Enable sort faces tool ( checked in code for the tool but forgot to uncomment the line to hook it up ), and fix for an uninitialized local in build modifier.

[Andrew Wiggin]

Revision: 40812
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40812
Author:   ender79
Date:     2011-10-06 02:05:27 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Enable sort faces tool (checked in code for the tool but forgot to uncomment 
the line to hook it up), and fix for an uninitialized local in build modifier.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c       
2011-10-06 02:04:43 UTC (rev 40811)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c       
2011-10-06 02:05:27 UTC (rev 40812)
@@ -119,7 +119,7 @@
        WM_operatortype_append(MESH_OT_edge_flip);
        WM_operatortype_append(MESH_OT_faces_shade_smooth);
        WM_operatortype_append(MESH_OT_faces_shade_flat);
-       //WM_operatortype_append(MESH_OT_sort_faces);
+       WM_operatortype_append(MESH_OT_sort_faces);
 
        WM_operatortype_append(MESH_OT_delete);
 

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c  
2011-10-06 02:04:43 UTC (rev 40811)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c  
2011-10-06 02:05:27 UTC (rev 40812)
@@ -86,7 +86,7 @@
        DerivedMesh *result;
        BuildModifierData *bmd = (BuildModifierData*) md;
        int i, j, k;
-       int numFaces, numEdges, numLoops;
+       int numFaces, numEdges, numLoops = 0;
        int *vertMap, *edgeMap, *faceMap;
        float frac;
        MPoly *mpolys, *mpolyd;
@@ -141,7 +141,6 @@
                /* get the set of all vert indices that will be in the final 
mesh,
                * mapped to the new indices
                */
-               numLoops = 0;
                mpoly = CDDM_get_polys(dm);
                mloop = CDDM_get_loops(dm);
                for(i = 0; i < numFaces; ++i) {
@@ -175,7 +174,7 @@
                }
        } else if(numEdges) {
                MEdge *medge, *me;
-               
+
                if(bmd->randomize)
                        BLI_array_randomize(edgeMap, sizeof(*edgeMap),
                                                maxEdges, bmd->seed);
@@ -207,7 +206,6 @@
                }
        } else {
                int numVerts = dm->getNumVerts(dm) * frac;
-               numLoops= 0;
 
                if(bmd->randomize)
                        BLI_array_randomize(vertMap, sizeof(*vertMap),

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