[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14856] trunk/blender/source/blender/ blenkernel/intern/modifier.c:

[Brecht Van Lommel]

Revision: 14856
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14856
Author:   blendix
Date:     2008-05-15 22:07:07 +0200 (Thu, 15 May 2008)

Log Message:
-----------

Fix for bug #11389: edgesplit modifier crash after subsurf when
no edges were being split.

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	2008-05-15 19:49:34 UTC (rev 14855)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-05-15 20:07:07 UTC (rev 14856)
@@ -1248,7 +1248,8 @@
 
 	result = arrayModifier_doArray(amd, ob, derivedData, 0);
 
-	CDDM_calc_normals(result);
+	if(result != derivedData)
+		CDDM_calc_normals(result);
 
 	return result;
 }
@@ -2674,7 +2675,8 @@
 
 	result = edgesplitModifier_do(emd, ob, derivedData);
 
-	CDDM_calc_normals(result);
+	if(result != derivedData)
+		CDDM_calc_normals(result);
 
 	return result;
 }