[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20867] trunk/blender/source/blender/ blenkernel/intern/modifier.c: coverity issue CID: 307

[Kent Mein]

Revision: 20867
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20867
Author:   sirdude
Date:     2009-06-14 00:23:24 +0200 (Sun, 14 Jun 2009)

Log Message:
-----------
coverity issue CID: 307
Checker: FORWARD_NULL (help)
File: base/src/source/blender/blenkernel/intern/modifier.c
Function: meshdeformModifier_deformVerts
Description: Variable "dm" tracked as NULL was passed to a function that dereferences it.

fix provided by Brecht.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2009-06-13 21:45:13 UTC (rev 20866)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2009-06-13 22:23:24 UTC (rev 20867)
@@ -7813,11 +7813,13 @@
 {
 	DerivedMesh *dm;
 
-	if(!derivedData && ob->type==OB_MESH)
-		dm= CDDM_from_mesh(ob->data, ob);
-	else
-		dm= derivedData;
+	if (!derivedData) {
+		dm= get_original_dm(ob, NULL, 0);
+		if (dm == NULL) return;
+	}
+	else dm= derivedData;
 
+
 	modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
 	
 	meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);