diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-24 03:30:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-24 03:30:01 +0400 |
| commit | fdf55bcf66e8999499cd4bddf4c8a6fef15f28a1 (patch) | |
| tree | 05fcc55dac3359b0571a0013dc589f4e2432949e /source/blender/editors/mesh/meshtools.c | |
| parent | e038d7212a773fc0b63cd98930a4b575f9cb8a12 (diff) | |
fix for crash joining objects with shape keys - own mistake when fixing another bug.
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |