[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28546] branches/render25/source/blender/ blenkernel/intern/DerivedMesh.c: don't allow modifiers (e.g.

Joseph Eagar joeedh at gmail.com
Mon May 3 17:36:17 CEST 2010


Revision: 28546
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28546
Author:   joeedh
Date:     2010-05-03 17:36:17 +0200 (Mon, 03 May 2010)

Log Message:
-----------
don't allow modifiers (e.g. cloth) after multires if in sculpt mode; should fix 22021.  more work is needed, since while it doesn't crash anymore, you also can't sculpt without manually disabling the modifiers.

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

Modified: branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/DerivedMesh.c	2010-05-03 11:27:31 UTC (rev 28545)
+++ branches/render25/source/blender/blenkernel/intern/DerivedMesh.c	2010-05-03 15:36:17 UTC (rev 28546)
@@ -1741,7 +1741,6 @@
 		 */
 
 		if(mti->type == eModifierTypeType_OnlyDeform) {
-			
 			/* No existing verts to deform, need to build them. */
 			if(!deformedVerts) {
 				if(dm) {
@@ -1867,10 +1866,14 @@
 				}
 			}
 		}
-		
+
 		/* grab modifiers until index i */
 		if((index >= 0) && (modifiers_indexInObject(ob, md) >= index))
 			break;
+
+		/*don't allow other modifiers past multires if in sculpt mode*/
+		if (!useRenderParams && ((ob->mode & OB_MODE_SCULPT) && ob->sculpt))
+			break;
 	}
 
 	for(md=firstmd; md; md=md->next)





More information about the Bf-blender-cvs mailing list