[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60063] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: fix [#36299] Skin Modifier causes crashes in combination with multiple Subdivision modifiers

[Campbell Barton]

Revision: 60063
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60063
Author:   campbellbarton
Date:     2013-09-12 08:28:41 +0000 (Thu, 12 Sep 2013)
Log Message:
-----------
fix [#36299] Skin Modifier causes crashes in combination with multiple Subdivision modifiers

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-09-12 04:23:06 UTC (rev 60062)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-09-12 08:28:41 UTC (rev 60063)
@@ -2086,10 +2086,16 @@
 				mask &= ~CD_MASK_ORCO;
 				DM_set_only_copy(orcodm, mask | CD_MASK_ORIGINDEX);
 
-				if (mti->applyModifierEM)
+				/* disabled: subsurf can't calculate twice on the same editmesh (uses freed cache) [#36299] */
+#if 0
+				if (mti->applyModifierEM) {
 					ndm = modwrap_applyModifierEM(md, ob, em, orcodm, MOD_APPLY_ORCO);
+				}
 				else
+#endif
+				{
 					ndm = modwrap_applyModifier(md, ob, orcodm, MOD_APPLY_ORCO);
+				}
 				ASSERT_IS_VALID_DM(ndm);
 
 				if (ndm) {