[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26012] trunk/blender/release/scripts/op/ object.py: Fix [#20514] In sculpting mode is possible to use page down/ up to exceed the actual multiresolution level

[Matt Ebb]

Revision: 26012
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26012
Author:   broken
Date:     2010-01-15 06:00:02 +0100 (Fri, 15 Jan 2010)

Log Message:
-----------
Fix [#20514] In sculpting mode is possible to use page down/up to exceed the actual multiresolution level

Modified Paths:
--------------
    trunk/blender/release/scripts/op/object.py

Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py	2010-01-15 01:21:56 UTC (rev 26011)
+++ trunk/blender/release/scripts/op/object.py	2010-01-15 05:00:02 UTC (rev 26012)
@@ -102,20 +102,24 @@
         def set_object_subd(obj):
             for mod in obj.modifiers:
                 if mod.type == 'MULTIRES':
-                    if level <= mod.total_levels:
+                    if not relative:
+                        if level <= mod.total_levels:
+                            if obj.mode == 'SCULPT':
+                                if mod.sculpt_levels != level:
+                                    mod.sculpt_levels = level
+                            elif obj.mode == 'OBJECT':
+                                if mod.levels != level:
+                                    mod.levels = level                          
+                        return
+                    else:
                         if obj.mode == 'SCULPT':
-                            if relative:
+                            if mod.sculpt_levels+level <= mod.total_levels:
                                 mod.sculpt_levels += level
-                            else:
-                                if mod.sculpt_levels != level:
-                                    mod.sculpt_levels = level
                         elif obj.mode == 'OBJECT':
-                            if relative:
+                            if mod.levels+level <= mod.total_levels:
                                 mod.levels += level
-                            else:
-                                if mod.levels != level:
-                                    mod.levels = level
-                    return
+                        return
+                
                 elif mod.type == 'SUBSURF':
                     if relative:
                         mod.levels += level