[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57220] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: Fix #35610: Multiresolution Modifier Complains About Sculpt Mode

[Sergey Sharybin]

Revision: 57220
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57220
Author:   nazgul
Date:     2013-06-03 08:26:12 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
Fix #35610: Multiresolution Modifier Complains About Sculpt Mode

If multires has got zero subdivisions in sculpt mode, no need
of displaying warning message. It was rather strange decision
which confused artists.

Now multires with zero subdivisions will be ignored silently
when in sculpt mode.

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-06-03 06:55:18 UTC (rev 57219)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-06-03 08:26:12 UTC (rev 57220)
@@ -1609,13 +1609,17 @@
 		{
 			int unsupported = 0;
 
+			if (md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0) {
+				/* If multires is on level 0 skip it silently without warning message. */
+				continue;
+			}
+
 			if (sculpt_dyntopo && !useRenderParams)
 				unsupported = TRUE;
 
 			if (scene->toolsettings->sculpt->flags & SCULPT_ONLY_DEFORM)
 				unsupported |= mti->type != eModifierTypeType_OnlyDeform;
 
-			unsupported |= md->type == eModifierType_Multires && ((MultiresModifierData *)md)->sculptlvl == 0;
 			unsupported |= multires_applied;
 
 			if (unsupported) {