[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45819] trunk/blender/source/blender/bmesh /intern/bmesh_mesh_conv.c: fix for error using uninitialized variable with shape key conversion.

[Campbell Barton]

Revision: 45819
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45819
Author:   campbellbarton
Date:     2012-04-20 18:34:58 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
fix for error using uninitialized variable with shape key conversion.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-04-20 17:26:40 UTC (rev 45818)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-04-20 18:34:58 UTC (rev 45819)
@@ -824,7 +824,10 @@
 					/* in most cases this runs */
 					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,
 					 * currently used if the new method above fails (which is theoretically
 					 * possible in certain cases of undo) */