[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16034] branches/soc-2008-nicholasbishop/ source/blender/src/sculptmode.c: Only do multires mode in sculptmode if multires is the last modifier on the stack .

[Nicholas Bishop]

Revision: 16034
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16034
Author:   nicholasbishop
Date:     2008-08-09 03:43:47 +0200 (Sat, 09 Aug 2008)

Log Message:
-----------
Only do multires mode in sculptmode if multires is the last modifier on the stack. Otherwise, treat it like a regular modifier.

Modified Paths:
--------------
    branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c

Modified: branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c	2008-08-09 00:18:37 UTC (rev 16033)
+++ branches/soc-2008-nicholasbishop/source/blender/src/sculptmode.c	2008-08-09 01:43:47 UTC (rev 16034)
@@ -1482,12 +1482,14 @@
 	return 0;
 }
 
+/* Sculpt mode handles multires differently from regular meshes, but only if
+   it's the last modifier on the stack and it is not on the first level */
 struct MultiresModifierData *sculpt_multires_active(Object *ob)
 {
 	ModifierData *md;
 	
 	for(md= modifiers_getVirtualModifierList(OBACT); md; md= md->next) {
-		if(md->type == eModifierType_Multires) {
+		if(md->type == eModifierType_Multires && !md->next) {
 			MultiresModifierData *mmd = (MultiresModifierData*)md;
 			if(mmd->lvl != 1)
 				return mmd;