fix for crash joining objects with shape keys - own mistake when fixing another bug.

2012-09-23 23:30:01 +00:00
parent e038d7212a
commit fdf55bcf66
1 changed files with 1 additions and 1 deletions
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -400,7 +400,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 							fp1 = ((float *)kb->data) + (vertofs * 3);
 							
 							/* check if this was one of the original shapekeys */
-							okb = BKE_keyblock_find_name(nkey, kb->name);
+							okb = nkey ? BKE_keyblock_find_name(nkey, kb->name) : NULL;
 							if (okb) {
 								/* copy this mesh's shapekey to the destination shapekey */
 								fp2 = ((float *)(okb->data));