From fdf55bcf66e8999499cd4bddf4c8a6fef15f28a1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 23 Sep 2012 23:30:01 +0000 Subject: [PATCH] fix for crash joining objects with shape keys - own mistake when fixing another bug. --- source/blender/editors/mesh/meshtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index f2b7a2e9c22..ef826c07cc1 100644 --- 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));