Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-23 11:28:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-23 11:28:30 +0400
commit7faa531a627b3010f614114531f0f54c12553cf1 (patch)
tree2189923d1a928501d2a98b57ea75112df76c1770 /source/blender/editors/object
parent6b4cecc4662f6f7e5c99f1bf2b1706771c37a00b (diff)
fix for possible crash using an un-initialized pointer when getting a vertex weight from a non-mesh/lattice object.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_vgroup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index d1315001f9e..53562caf1b5 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -508,7 +508,7 @@ void ED_vgroup_vert_remove(Object *ob, bDeformGroup *dg, int vertnum)
static float get_vert_def_nr(Object *ob, int def_nr, int vertnum)
{
- MDeformVert *dvert;
+ MDeformVert *dvert= NULL;
EditVert *eve;
Mesh *me;
int i;
@@ -519,7 +519,9 @@ static float get_vert_def_nr(Object *ob, int def_nr, int vertnum)
if(me->edit_mesh) {
eve= BLI_findlink(&me->edit_mesh->verts, vertnum);
- if(!eve) return 0.0f;
+ if(!eve) {
+ return 0.0f;
+ }
dvert= CustomData_em_get(&me->edit_mesh->vdata, eve->data, CD_MDEFORMVERT);
vertnum= 0;
}