[Bf-blender-cvs] [07f0a33] temp-derivedmesh-looptri: When calculating the modifier stack, prepare for looptri by default

[Campbell Barton]

Commit: 07f0a332d4f6bc6ef5a7d475d32dda106f6953ca
Author: Campbell Barton
Date:   Fri Jul 17 00:16:44 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB07f0a332d4f6bc6ef5a7d475d32dda106f6953ca

When calculating the modifier stack, prepare for looptri by default

Note, this only triggers actual tessellation for CDDM.

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 336a346..d8e823c 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -450,11 +450,6 @@ void DM_ensure_tessface(DerivedMesh *dm)
 	}
 
 	dm->dirty &= ~DM_DIRTY_TESS_CDLAYERS;
-
-	/* -------------------------------------------------------------------- */
-	/* ---------------------- WATCH IT! THIS IS ONLY HERE FOR TESTING ----- */
-	/* -------------------------------------------------------------------- */
-	DM_ensure_looptri(dm);
 }
 
 /**
@@ -2112,7 +2107,12 @@ static void mesh_calc_modifiers(
 	}
 
 	if (sculpt_dyntopo == false) {
+		/* watch this! after 2.75a we move to from tessface to looptri (by default) */
+#if 0
 		DM_ensure_tessface(finaldm);
+#else
+		DM_ensure_looptri(finaldm);
+#endif
 
 		/* without this, drawing ngon tri's faces will show ugly tessellated face
 		 * normals and will also have to calculate normals on the fly, try avoid