[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23907] trunk/blender/source/blender/ editors/mesh/editmesh_tools.c: simple fix for blend from shape when no keys exist

[Campbell Barton]

Revision: 23907
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23907
Author:   campbellbarton
Date:     2009-10-17 18:52:09 +0200 (Sat, 17 Oct 2009)

Log Message:
-----------
simple fix for blend from shape when no keys exist

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

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2009-10-17 15:25:19 UTC (rev 23906)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2009-10-17 16:52:09 UTC (rev 23907)
@@ -94,10 +94,8 @@
 #include "mesh_intern.h"
 
 /* XXX */
-static int extern_qread() {return 0;}
 static void waitcursor(int val) {}
 static int pupmenu() {return 0;}
-static int qtest() {return 0;}
 #define add_numbut(a, b, c, d, e, f, g) {}
 
 /* XXX */
@@ -5083,9 +5081,7 @@
 	int add= RNA_int_get(op->ptr, "add");
 	int blended= 0;
 
-	kb= BLI_findlink(&key->block, shape);
-
-	if(kb) {
+	if(key && (kb= BLI_findlink(&key->block, shape))) {
 		data= kb->data;
 
 		for(eve=em->verts.first; eve; eve=eve->next){