Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00
parent 1d529d83a0 6a374d266d
commit f0d5abfcb2
151 changed files with 1992 additions and 1457 deletions
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -195,8 +195,12 @@ class SubdivisionSet(Operator):
    bl_label = "Subdivision Set"
    bl_options = {'REGISTER', 'UNDO'}

-    level = IntProperty(name="Level",
-            default=1, min=-100, max=100, soft_min=-6, soft_max=6)
+    level = IntProperty(
+            name="Level",
+            min=-100, max=100,
+            soft_min=-6, soft_max=6,
+            default=1,
+            )

    relative = BoolProperty(
            name="Relative",