kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for error using uninitialized variable with shape key conversion.

Browse Source
This commit is contained in:
Campbell Barton 2012-04-20 18:34:58 +00:00
parent 3dcd5a196d
commit 2e20d3dc96
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/bmesh/intern/bmesh_mesh_conv.c
View File

@ -824,7 +824,10 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess)
/* in most cases this runs */ /* in most cases this runs */
copy_v3_v3(fp, CustomData_bmesh_get_n(&bm->vdata, eve->head.data, CD_SHAPEKEY, j)); copy_v3_v3(fp, CustomData_bmesh_get_n(&bm->vdata, eve->head.data, CD_SHAPEKEY, j));
} }
else if (oldkey) { else if (oldkey &&
(keyi = CustomData_bmesh_get(&bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX)) &&
(*keyi != ORIGINDEX_NONE && *keyi < currkey->totelem))
{
/* old method of reconstructing keys via vertice's original key indices, /* old method of reconstructing keys via vertice's original key indices,
* currently used if the new method above fails (which is theoretically * currently used if the new method above fails (which is theoretically
* possible in certain cases of undo) */ * possible in certain cases of undo) */