archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

replace inline loops for get_weights_array with calls to defvert_find_weight()

Browse Source
This commit is contained in:
Campbell Barton
2011-06-30 03:04:39 +00:00
parent c490baceed
commit 5c3e73fd56
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/key.c
View File

@@ -63,6 +63,7 @@
#include "BKE_library.h" #include "BKE_library.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_deform.h"
#include "RNA_access.h" #include "RNA_access.h"
@@ -1005,7 +1006,7 @@ static float *get_weights_array(Object *ob, char *vgroup)
MDeformVert *dvert= NULL; MDeformVert *dvert= NULL;
EditMesh *em= NULL; EditMesh *em= NULL;
EditVert *eve; EditVert *eve;
int totvert= 0, index= 0; int totvert= 0, defgrp_index= 0;
/* no vgroup string set? */ /* no vgroup string set? */
if(vgroup[0]==0) return NULL; if(vgroup[0]==0) return NULL;
@@ -1028,7 +1029,7 @@ static float *get_weights_array(Object *ob, char *vgroup)
if(dvert==NULL) return NULL; if(dvert==NULL) return NULL;
/* find the group (weak loop-in-loop) */ /* find the group (weak loop-in-loop) */
index= defgroup_name_index(ob, vgroup); defgrp_index= defgroup_name_index(ob, vgroup);
if(index >= 0) { if(index >= 0) {
float *weights; float *weights;
int i, j; int i, j;
@@ -1040,23 +1041,13 @@ static float *get_weights_array(Object *ob, char *vgroup)
dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT); dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
if(dvert) { if(dvert) {
for(j=0; j<dvert->totweight; j++) { weights[i]= defvert_find_weight(dvert, defgrp_index);
if(dvert->dw[j].def_nr == index) {
weights[i]= dvert->dw[j].weight;
break;
}
}
} }
} }
} }
else { else {
for(i=0; i < totvert; i++, dvert++) { for(i=0; i < totvert; i++, dvert++) {
for(j=0; j<dvert->totweight; j++) { weights[i]= defvert_find_weight(dvert, defgrp_index);
if(dvert->dw[j].def_nr == index) {
weights[i]= dvert->dw[j].weight;
break;
}
}
} }
} }

1
source/blender/editors/object/object_hook.c
View File

@@ -56,6 +56,7 @@
#include "BKE_object.h" #include "BKE_object.h"
#include "BKE_report.h" #include "BKE_report.h"
#include "BKE_scene.h" #include "BKE_scene.h"
#include "BKE_deform.h"
#include "RNA_define.h" #include "RNA_define.h"
#include "RNA_access.h" #include "RNA_access.h"