[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45009] trunk/blender/source/blender: CDDM_calc_edges_tessface was being called twice for boolean and explide modifiers , now leave it up to the caller to run.

[Campbell Barton]

Revision: 45009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45009
Author:   campbellbarton
Date:     2012-03-20 00:59:51 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
CDDM_calc_edges_tessface was being called twice for boolean and explide modifiers, now leave it up to the caller to run.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    trunk/blender/source/blender/modifiers/intern/MOD_explode.c

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-03-20 00:51:37 UTC (rev 45008)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-03-20 00:59:51 UTC (rev 45009)
@@ -2576,9 +2576,12 @@
 	MEdge *me;
 	EdgeHash *eh = BLI_edgehash_new();
 	int i, totloop;
-	
-	/*ensure we have all the edges we need*/
+
+	/* ... on second thaughts, better comment this and assume caller knows edge state. */
+#if 0
+	/* ensure we have all the edges we need */
 	CDDM_calc_edges_tessface(dm);
+#endif
 
 	/*build edge hash*/
 	me = cddm->medge;

Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c	2012-03-20 00:51:37 UTC (rev 45008)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c	2012-03-20 00:59:51 UTC (rev 45009)
@@ -774,6 +774,7 @@
 	MEM_freeN(facesplit);
 	MEM_freeN(vertpa);
 
+	CDDM_calc_edges_tessface(splitdm);
 	CDDM_tessfaces_to_faces(splitdm); /*builds ngon faces from tess (mface) faces*/
 
 	return splitdm;