[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43802] trunk/blender/source/blender/ blenkernel/intern/lattice.c: fix inconsistancy with curve deform bounds being set differently when vertex groups were used .

[Campbell Barton]

Revision: 43802
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43802
Author:   campbellbarton
Date:     2012-01-31 20:48:48 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
fix inconsistancy with curve deform bounds being set differently when vertex 
groups were used.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/lattice.c

Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c    2012-01-31 
20:38:03 UTC (rev 43801)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c    2012-01-31 
20:48:48 UTC (rev 43802)
@@ -714,10 +714,6 @@
        
 
                        if(cu->flag & CU_DEFORM_BOUNDS_OFF) {
-                               /* dummy bounds */
-                               cd.dmin[0]= cd.dmin[1]= cd.dmin[2]= 0.0f;
-                               cd.dmax[0]= cd.dmax[1]= cd.dmax[2]= 1.0f;
-                               
                                dvert = me->dvert;
                                for(a = 0; a < numVerts; a++, dvert++) {
                                        if(dm) dvert = dm->getVertData(dm, a, 
CD_MDEFORMVERT);
@@ -752,6 +748,7 @@
                                        weight= defvert_find_weight(dvert, 
index);
        
                                        if(weight > 0.0f) {
+                                               /* already in 'cd.curvespace', 
prev for loop */
                                                copy_v3_v3(vec, vertexCos[a]);
                                                calc_curve_deform(scene, cuOb, 
vec, defaxis, &cd, NULL);
                                                interp_v3_v3v3(vertexCos[a], 
vertexCos[a], vec, weight);
@@ -779,6 +776,7 @@
                        }
        
                        for(a = 0; a < numVerts; a++) {
+                               /* already in 'cd.curvespace', prev for loop */
                                calc_curve_deform(scene, cuOb, vertexCos[a], 
defaxis, &cd, NULL);
                                mul_m4_v3(cd.objectspace, vertexCos[a]);
                        }

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