[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42530] trunk/blender/source/blender/ blenkernel/intern/particle.c: function de-duplicate, particle.c had ' vert_weight' which serves the exact same purpose as 'defvert_find_weight'.

[Campbell Barton]

Revision: 42530
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42530
Author:   campbellbarton
Date:     2011-12-09 08:05:23 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
function de-duplicate, particle.c had 'vert_weight' which serves the exact same 
purpose as 'defvert_find_weight'.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c   2011-12-09 
07:35:56 UTC (rev 42529)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c   2011-12-09 
08:05:23 UTC (rev 42530)
@@ -79,6 +79,7 @@
 #include "BKE_cdderivedmesh.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
+#include "BKE_deform.h"
 
 #include "RE_render_ext.h"
 
@@ -1847,20 +1848,6 @@
 /************************************************/
 /*                     Path Cache                                              
        */
 /************************************************/
-static float vert_weight(MDeformVert *dvert, int group)
-{
-       MDeformWeight *dw;
-       int i;
-       
-       if(dvert) {
-               dw= dvert->dw;
-               for(i= dvert->totweight; i>0; i--, dw++) {
-                       if(dw->def_nr == group) return dw->weight;
-                       if(i==1) break; /*otherwise dw will point to somewhere 
it shouldn't*/
-               }
-       }
-       return 0.0;
-}
 
 static void do_kink(ParticleKey *state, ParticleKey *par, float *par_rot, 
float time, float freq, float shape, float amplitude, float flat, short type, 
short axis, float obmat[][4], int smooth_start)
 {
@@ -2308,11 +2295,11 @@
                        vg=MEM_callocN(sizeof(float)*totvert, "vg_cache");
                        if(psys->vg_neg&(1<<vgroup)){
                                for(i=0; i<totvert; i++)
-                                       
vg[i]=1.0f-vert_weight(dvert+i,psys->vgroup[vgroup]-1);
+                                       vg[i]= 1.0f - 
defvert_find_weight(&dvert[i], psys->vgroup[vgroup] - 1);
                        }
                        else{
                                for(i=0; i<totvert; i++)
-                                       
vg[i]=vert_weight(dvert+i,psys->vgroup[vgroup]-1);
+                                       vg[i]=  defvert_find_weight(&dvert[i], 
psys->vgroup[vgroup] - 1);
                        }
                }
        }

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