Revision: 36320
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36320
Author:   campbellbarton
Date:     2011-04-25 06:44:43 +0000 (Mon, 25 Apr 2011)
Log Message:
-----------
fix [#27140] Negative Subdiv level in the operator panel.
when relative option is disabled, don't allow setting the subdiv value to a 
negative number.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/object.py
    trunk/blender/source/blender/blenkernel/intern/mesh_validate.c

Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py        
2011-04-25 06:27:32 UTC (rev 36319)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py        
2011-04-25 06:44:43 UTC (rev 36320)
@@ -177,6 +177,9 @@
         if relative and level == 0:
             return {'CANCELLED'}  # nothing to do
 
+        if not relative and level < 0:
+            self.level = level = 0
+
         def set_object_subd(obj):
             for mod in obj.modifiers:
                 if mod.type == 'MULTIRES':

Modified: trunk/blender/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh_validate.c      
2011-04-25 06:27:32 UTC (rev 36319)
+++ trunk/blender/source/blender/blenkernel/intern/mesh_validate.c      
2011-04-25 06:44:43 UTC (rev 36320)
@@ -307,7 +307,9 @@
 
 int BKE_mesh_validate(Mesh *me, int do_verbose)
 {
-       printf("MESH: %s\n", me->id.name+2);
+       if(do_verbose) {
+               printf("MESH: %s\n", me->id.name+2);
+       }
        return BKE_mesh_validate_arrays(me, me->mvert, me->totvert, me->medge, 
me->totedge, me->mface, me->totface, do_verbose, TRUE);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to