[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50834] trunk/blender/source/blender/ editors/mesh/meshtools.c: fix for crash joining objects with shape keys - own mistake when fixing another bug .

[Campbell Barton]

Revision: 50834
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50834
Author:   campbellbarton
Date:     2012-09-23 23:30:01 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
fix for crash joining objects with shape keys - own mistake when fixing another bug.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/meshtools.c

Modified: trunk/blender/source/blender/editors/mesh/meshtools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/meshtools.c	2012-09-23 23:11:24 UTC (rev 50833)
+++ trunk/blender/source/blender/editors/mesh/meshtools.c	2012-09-23 23:30:01 UTC (rev 50834)
@@ -400,7 +400,7 @@
 							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));