[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37973] trunk/blender/source/blender: replace inline loops for get_weights_array with calls to defvert_find_weight ()
Campbell Barton
ideasman42 at gmail.com
Thu Jun 30 05:04:46 CEST 2011
Revision: 37973
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37973
Author: campbellbarton
Date: 2011-06-30 03:04:39 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
replace inline loops for get_weights_array with calls to defvert_find_weight()
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/editors/object/object_hook.c
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2011-06-30 02:52:13 UTC (rev 37972)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2011-06-30 03:04:39 UTC (rev 37973)
@@ -63,6 +63,7 @@
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_object.h"
+#include "BKE_deform.h"
#include "RNA_access.h"
@@ -1005,7 +1006,7 @@
MDeformVert *dvert= NULL;
EditMesh *em= NULL;
EditVert *eve;
- int totvert= 0, index= 0;
+ int totvert= 0, defgrp_index= 0;
/* no vgroup string set? */
if(vgroup[0]==0) return NULL;
@@ -1028,7 +1029,7 @@
if(dvert==NULL) return NULL;
/* find the group (weak loop-in-loop) */
- index= defgroup_name_index(ob, vgroup);
+ defgrp_index= defgroup_name_index(ob, vgroup);
if(index >= 0) {
float *weights;
int i, j;
@@ -1040,23 +1041,13 @@
dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
if(dvert) {
- for(j=0; j<dvert->totweight; j++) {
- if(dvert->dw[j].def_nr == index) {
- weights[i]= dvert->dw[j].weight;
- break;
- }
- }
+ weights[i]= defvert_find_weight(dvert, defgrp_index);
}
}
}
else {
for(i=0; i < totvert; i++, dvert++) {
- for(j=0; j<dvert->totweight; j++) {
- if(dvert->dw[j].def_nr == index) {
- weights[i]= dvert->dw[j].weight;
- break;
- }
- }
+ weights[i]= defvert_find_weight(dvert, defgrp_index);
}
}
Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c 2011-06-30 02:52:13 UTC (rev 37972)
+++ trunk/blender/source/blender/editors/object/object_hook.c 2011-06-30 03:04:39 UTC (rev 37973)
@@ -56,6 +56,7 @@
#include "BKE_object.h"
#include "BKE_report.h"
#include "BKE_scene.h"
+#include "BKE_deform.h"
#include "RNA_define.h"
#include "RNA_access.h"
More information about the Bf-blender-cvs
mailing list