Revision: 42531
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42531
Author: campbellbarton
Date: 2011-12-09 08:20:27 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
went over all uses of MDeformWeight.def_nr and made sure the value is clamped
when used as an array index.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_deform.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/modifiers/intern/MOD_mask.c
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_deform.h 2011-12-09
08:05:23 UTC (rev 42530)
+++ trunk/blender/source/blender/blenkernel/BKE_deform.h 2011-12-09
08:20:27 UTC (rev 42531)
@@ -63,7 +63,7 @@
void defvert_sync(struct MDeformVert *dvert_dst, const struct MDeformVert
*dvert_src, int use_verify);
void defvert_sync_mapped(struct MDeformVert *dvert_dst, const struct
MDeformVert *dvert_src,
const int *flip_map, const int flip_map_len, const
int use_verify);
-void defvert_remap (struct MDeformVert *dvert, int *map);
+void defvert_remap (struct MDeformVert *dvert, int *map, const int map_len);
void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int
flip_map_len);
void defvert_normalize(struct MDeformVert *dvert);
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-12-09 08:05:23 UTC (rev 42530)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-12-09 08:20:27 UTC (rev 42531)
@@ -642,7 +642,7 @@
};
static void calc_weightpaint_vert_color(
- Object *ob, ColorBand *coba, int vert, unsigned char *col,
+ Object *ob, const int defbase_tot, ColorBand *coba, int vert, unsigned
char *col,
const char *dg_flags, int selected, int UNUSED(unselected), const int
draw_flag)
{
Mesh *me = ob->data;
@@ -661,10 +661,12 @@
for (i = dvert->totweight; i > 0; i--, dw++) {
/* in multipaint, get the average if auto
normalize is inactive
* get the sum if it is active */
- if (dg_flags[dw->def_nr]) {
- if (dw->weight) {
- input += dw->weight;
- was_a_nonzero= TRUE;
+ if (dw->def_nr < defbase_tot) {
+ if (dg_flags[dw->def_nr]) {
+ if (dw->weight) {
+ input += dw->weight;
+ was_a_nonzero= TRUE;
+ }
}
}
}
@@ -718,20 +720,20 @@
unsigned char *wtcol;
int i;
- int defbase_len = BLI_countlist(&ob->defbase);
- char *defbase_sel = MEM_mallocN(defbase_len * sizeof(char), __func__);
- int selected = get_selected_defgroups(ob, defbase_sel, defbase_len);
- int unselected = defbase_len - selected;
+ int defbase_tot = BLI_countlist(&ob->defbase);
+ char *defbase_sel = MEM_mallocN(defbase_tot * sizeof(char), __func__);
+ int selected = get_selected_defgroups(ob, defbase_sel, defbase_tot);
+ int unselected = defbase_tot - selected;
wtcol = MEM_callocN (sizeof (unsigned char) * me->totface*4*4,
"weightmap");
memset(wtcol, 0x55, sizeof (unsigned char) * me->totface*4*4);
for (i=0; i<me->totface; i++, mf++) {
- calc_weightpaint_vert_color(ob, coba, mf->v1, &wtcol[(i*4 +
0)*4], defbase_sel, selected, unselected, draw_flag);
- calc_weightpaint_vert_color(ob, coba, mf->v2, &wtcol[(i*4 +
1)*4], defbase_sel, selected, unselected, draw_flag);
- calc_weightpaint_vert_color(ob, coba, mf->v3, &wtcol[(i*4 +
2)*4], defbase_sel, selected, unselected, draw_flag);
+ calc_weightpaint_vert_color(ob, defbase_tot, coba, mf->v1,
&wtcol[(i*4 + 0)*4], defbase_sel, selected, unselected, draw_flag);
+ calc_weightpaint_vert_color(ob, defbase_tot, coba, mf->v2,
&wtcol[(i*4 + 1)*4], defbase_sel, selected, unselected, draw_flag);
+ calc_weightpaint_vert_color(ob, defbase_tot, coba, mf->v3,
&wtcol[(i*4 + 2)*4], defbase_sel, selected, unselected, draw_flag);
if (mf->v4)
- calc_weightpaint_vert_color(ob, coba, mf->v4,
&wtcol[(i*4 + 3)*4], defbase_sel, selected, unselected, draw_flag);
+ calc_weightpaint_vert_color(ob, defbase_tot, coba,
mf->v4, &wtcol[(i*4 + 3)*4], defbase_sel, selected, unselected, draw_flag);
}
MEM_freeN(defbase_sel);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2011-12-09
08:05:23 UTC (rev 42530)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2011-12-09
08:20:27 UTC (rev 42531)
@@ -827,7 +827,7 @@
const short use_envelope = deformflag & ARM_DEF_ENVELOPE;
const short use_quaternion = deformflag & ARM_DEF_QUATERNION;
const short invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP;
- int numGroups = 0; /* safety for vertexgroup index
overflow */
+ int defbase_tot = 0; /* safety for vertexgroup index
overflow */
int i, target_totvert = 0; /* safety for vertexgroup overflow */
int use_dverts = 0;
int armature_def_nr;
@@ -869,7 +869,7 @@
armature_def_nr= defgroup_name_index(target, defgrp_name);
if(ELEM(target->type, OB_MESH, OB_LATTICE)) {
- numGroups = BLI_countlist(&target->defbase);
+ defbase_tot = BLI_countlist(&target->defbase);
if(target->type==OB_MESH) {
Mesh *me= target->data;
@@ -896,8 +896,8 @@
else if(dverts) use_dverts = 1;
if(use_dverts) {
- defnrToPC = MEM_callocN(sizeof(*defnrToPC) *
numGroups, "defnrToBone");
- defnrToPCIndex =
MEM_callocN(sizeof(*defnrToPCIndex) * numGroups, "defnrToIndex");
+ defnrToPC = MEM_callocN(sizeof(*defnrToPC) *
defbase_tot, "defnrToBone");
+ defnrToPCIndex =
MEM_callocN(sizeof(*defnrToPCIndex) * defbase_tot, "defnrToIndex");
for(i = 0, dg = target->defbase.first; dg;
i++, dg = dg->next) {
defnrToPC[i] =
get_pose_channel(armOb->pose, dg->name);
@@ -975,7 +975,7 @@
for(j = 0; j < dvert->totweight; j++){
int index = dvert->dw[j].def_nr;
- if(index < numGroups && (pchan=
defnrToPC[index])) {
+ if(index < defbase_tot && (pchan=
defnrToPC[index])) {
float weight = dvert->dw[j].weight;
Bone *bone= pchan->bone;
pdef_info= pdef_info_array +
defnrToPCIndex[index];
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2011-12-09
08:05:23 UTC (rev 42530)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2011-12-09
08:20:27 UTC (rev 42531)
@@ -161,12 +161,14 @@
}
/* be sure all flip_map values are valid */
-void defvert_remap(MDeformVert *dvert, int *map)
+void defvert_remap(MDeformVert *dvert, int *map, const int map_len)
{
MDeformWeight *dw;
int i;
for (i=0, dw=dvert->dw; i<dvert->totweight; i++, dw++) {
- dw->def_nr= map[dw->def_nr];
+ if (dw->def_nr < map_len) {
+ dw->def_nr= map[dw->def_nr];
+ }
}
}
@@ -198,8 +200,10 @@
int i;
for (dw= dvert->dw, i=0; i<dvert->totweight; dw++, i++) {
- if ((dw->def_nr < flip_map_len) && (flip_map[dw->def_nr] >= 0))
{
- dw->def_nr= flip_map[dw->def_nr];
+ if (dw->def_nr < flip_map_len) {
+ if (flip_map[dw->def_nr] >= 0) {
+ dw->def_nr= flip_map[dw->def_nr];
+ }
}
}
}
@@ -283,17 +287,17 @@
/* note, must be freed */
int *defgroup_flip_map(Object *ob, int *flip_map_len, int use_default)
{
- int totdg= *flip_map_len= BLI_countlist(&ob->defbase);
+ int defbase_tot= *flip_map_len= BLI_countlist(&ob->defbase);
- if (totdg==0) {
+ if (defbase_tot==0) {
return NULL;
}
else {
bDeformGroup *dg;
char name[sizeof(dg->name)];
- int i, flip_num, *map= MEM_mallocN(totdg * sizeof(int),
__func__);
+ int i, flip_num, *map= MEM_mallocN(defbase_tot * sizeof(int),
__func__);
- for (i=0; i < totdg; i++) {
+ for (i=0; i < defbase_tot; i++) {
map[i]= -1;
}
@@ -321,17 +325,17 @@
/* note, must be freed */
int *defgroup_flip_map_single(Object *ob, int *flip_map_len, int use_default,
int defgroup)
{
- int totdg= *flip_map_len= BLI_countlist(&ob->defbase);
+ int defbase_tot= *flip_map_len= BLI_countlist(&ob->defbase);
- if (totdg==0) {
+ if (defbase_tot==0) {
return NULL;
}
else {
bDeformGroup *dg;
char name[sizeof(dg->name)];
- int i, flip_num, *map= MEM_mallocN(totdg * sizeof(int),
__func__);
+ int i, flip_num, *map= MEM_mallocN(defbase_tot * sizeof(int),
__func__);
- for (i=0; i < totdg; i++) {
+ for (i=0; i < defbase_tot; i++) {
if (use_default) map[i]= i;
else map[i]= -1;
}
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2011-12-09
08:05:23 UTC (rev 42530)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2011-12-09
08:20:27 UTC (rev 42531)
@@ -286,8 +286,8 @@
int dvert_tot_from;
int dvert_tot;
int i;
- int totdef_from= BLI_countlist(&ob_from->defbase);
- int totdef= BLI_countlist(&ob->defbase);
+ int defbase_tot_from= BLI_countlist(&ob_from->defbase);
+ int defbase_tot= BLI_countlist(&ob->defbase);
short new_vgroup= FALSE;
ED_vgroup_give_parray(ob_from->data, &dvert_array_from,
&dvert_tot_from);
@@ -314,11 +314,11 @@
BLI_duplicatelist(&ob->defbase, &ob_from->defbase);
ob->actdef= ob_from->actdef;
- if(totdef_from < totdef) {
+ if(defbase_tot_from < defbase_tot) {
/* correct vgroup indices because the number of vgroups is
being reduced. */
- int *remap= MEM_mallocN(sizeof(int) * (totdef + 1),
"ED_vgroup_copy_array");
- for(i=0; i<=totdef_from; i++) remap[i]= i;
- for(; i<=totdef; i++) remap[i]= 0; /* can't use these, so
disable */
+ int *remap= MEM_mallocN(sizeof(int) * (defbase_tot + 1),
"ED_vgroup_copy_array");
+ for(i=0; i<=defbase_tot_from; i++) remap[i]= i;
+ for(; i<=defbase_tot; i++) remap[i]= 0; /* can't use these, so
disable */
vgroup_remap_update_users(ob, remap);
MEM_freeN(remap);
@@ -1809,12 +1809,12 @@
static void vgroup_delete_update_users(Object *ob, int id)
{
- int i, tot= BLI_countlist(&ob->defbase) + 1;
- int *map= MEM_mallocN(sizeof(int) * tot, "vgroup del");
+ int i, defbase_tot= BLI_countlist(&ob->defbase) + 1;
+ int *map= MEM_mallocN(sizeof(int) * defbase_tot, "vgroup del");
map[id]= map[0]= 0;
for(i=1; i<id; i++) map[i]=i;
- for(i=id+1; i<tot; i++) map[i]=i-1;
+ for(i=id+1; i<defbase_tot; i++) map[i]=i-1;
vgroup_remap_update_users(ob, map);
MEM_freeN(map);
@@ -2817,8 +2817,8 @@
static char *vgroup_init_remap(Object *ob)
{
bDeformGroup *def;
- int def_tot = BLI_countlist(&ob->defbase);
- char *name_array= MEM_mallocN(MAX_VGROUP_NAME * sizeof(char) * def_tot,
"sort vgroups");
+ int defbase_tot = BLI_countlist(&ob->defbase);
+ char *name_array= MEM_mallocN(MAX_VGROUP_NAME * sizeof(char) *
defbase_tot, "sort vgroups");
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
