[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39563] trunk/blender/release/scripts: py style change only - make property definitions consistent

Campbell Barton ideasman42 at gmail.com
Fri Aug 19 21:25:22 CEST 2011


Revision: 39563
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39563
Author:   campbellbarton
Date:     2011-08-19 19:25:20 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
py style change only - make property definitions consistent

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    trunk/blender/release/scripts/startup/bl_operators/mesh.py
    trunk/blender/release/scripts/startup/bl_operators/object.py
    trunk/blender/release/scripts/startup/bl_operators/object_align.py
    trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
    trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
    trunk/blender/release/scripts/startup/bl_operators/sequencer.py
    trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    trunk/blender/release/scripts/startup/bl_operators/wm.py
    trunk/blender/release/scripts/startup/bl_ui/__init__.py
    trunk/blender/release/scripts/startup/bl_ui/space_console.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
    trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
    trunk/blender/release/scripts/templates/addon_add_object.py
    trunk/blender/release/scripts/templates/operator_export.py
    trunk/blender/release/scripts/templates/operator_mesh_add.py
    trunk/blender/release/scripts/templates/operator_modal_view3d.py

Modified: trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2011-08-19 19:10:50 UTC (rev 39562)
+++ trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py	2011-08-19 19:25:20 UTC (rev 39563)
@@ -88,36 +88,62 @@
     bl_label = "Add Torus"
     bl_options = {'REGISTER', 'UNDO'}
 
-    major_radius = FloatProperty(name="Major Radius",
+    major_radius = FloatProperty(
+            name="Major Radius",
             description=("Radius from the origin to the "
                          "center of the cross sections"),
-            default=1.0, min=0.01, max=100.0)
-    minor_radius = FloatProperty(name="Minor Radius",
+            min=0.01, max=100.0,
+            default=1.0,
+            )
+    minor_radius = FloatProperty(
+            name="Minor Radius",
             description="Radius of the torus' cross section",
-            default=0.25, min=0.01, max=100.0)
-    major_segments = IntProperty(name="Major Segments",
+            min=0.01, max=100.0,
+            default=0.25,
+            )
+    major_segments = IntProperty(
+            name="Major Segments",
             description="Number of segments for the main ring of the torus",
-            default=48, min=3, max=256)
-    minor_segments = IntProperty(name="Minor Segments",
+            min=3, max=256,
+            default=48,
+            )
+    minor_segments = IntProperty(
+            name="Minor Segments",
             description="Number of segments for the minor ring of the torus",
-            default=12, min=3, max=256)
-    use_abso = BoolProperty(name="Use Int+Ext Controls",
+            min=3, max=256,
+            default=12,
+            )
+    use_abso = BoolProperty(
+            name="Use Int+Ext Controls",
             description="Use the Int / Ext controls for torus dimensions",
-            default=False)
-    abso_major_rad = FloatProperty(name="Exterior Radius",
+            default=False,
+            )
+    abso_major_rad = FloatProperty(
+            name="Exterior Radius",
             description="Total Exterior Radius of the torus",
-            default=1.0, min=0.01, max=100.0)
-    abso_minor_rad = FloatProperty(name="Inside Radius",
+            min=0.01, max=100.0,
+            default=1.0,
+            )
+    abso_minor_rad = FloatProperty(
+            name="Inside Radius",
             description="Total Interior Radius of the torus",
-            default=0.5, min=0.01, max=100.0)
+            min=0.01, max=100.0,
+            default=0.5,
+            )
 
     # generic transform props
-    view_align = BoolProperty(name="Align to View",
-            default=False)
-    location = FloatVectorProperty(name="Location",
-            subtype='TRANSLATION')
-    rotation = FloatVectorProperty(name="Rotation",
-            subtype='EULER')
+    view_align = BoolProperty(
+            name="Align to View",
+            default=False,
+            )
+    location = FloatVectorProperty(
+            name="Location",
+            subtype='TRANSLATION',
+            )
+    rotation = FloatVectorProperty(
+            name="Rotation",
+            subtype='EULER',
+            )
 
     def execute(self, context):
 

Modified: trunk/blender/release/scripts/startup/bl_operators/mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/mesh.py	2011-08-19 19:10:50 UTC (rev 39562)
+++ trunk/blender/release/scripts/startup/bl_operators/mesh.py	2011-08-19 19:25:20 UTC (rev 39563)
@@ -74,11 +74,11 @@
     bl_label = "Copy Mirrored UV coords"
     bl_options = {'REGISTER', 'UNDO'}
 
-    direction = EnumProperty(items=(
-                        ('POSITIVE', "Positive", ""),
-                        ('NEGATIVE', "Negative", "")),
-                name="Axis Direction",
-                description="")
+    direction = EnumProperty(
+            name="Axis Direction",
+            items=(('POSITIVE', "Positive", ""),
+                   ('NEGATIVE', "Negative", "")),
+            )
 
     @classmethod
     def poll(cls, context):

Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py	2011-08-19 19:10:50 UTC (rev 39562)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py	2011-08-19 19:25:20 UTC (rev 39563)
@@ -195,8 +195,12 @@
     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",

Modified: trunk/blender/release/scripts/startup/bl_operators/object_align.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_align.py	2011-08-19 19:10:50 UTC (rev 39562)
+++ trunk/blender/release/scripts/startup/bl_operators/object_align.py	2011-08-19 19:25:20 UTC (rev 39563)
@@ -351,34 +351,35 @@
             description=("Enables high quality calculation of the "
                          "bounding box for perfect results on complex "
                          "shape meshes with rotation/scale (Slow)"),
-            default=True)
+            default=True,
+            )
+    align_mode = EnumProperty(
+            name="Align Mode:",
+            items=(('OPT_1', "Negative Sides", ""),
+                   ('OPT_2', "Centers", ""),
+                   ('OPT_3', "Positive Sides", ""),
+                   ),
+            default='OPT_2',
+            )
+    relative_to = EnumProperty(
+            name="Relative To:",
+            items=(('OPT_1', "Scene Origin", ""),
+                   ('OPT_2', "3D Cursor", ""),
+                   ('OPT_3', "Selection", ""),
+                   ('OPT_4', "Active", ""),
+                   ),
+            default='OPT_4',
+            )
+    align_axis = EnumProperty(
+            name="Align",
+            description="Align to axis",
+            items=(('X', "X", ""),
+                   ('Y', "Y", ""),
+                   ('Z', "Z", ""),
+                   ),
+            options={'ENUM_FLAG'},
+            )
 
-    align_mode = EnumProperty(items=(
-            ('OPT_1', "Negative Sides", ""),
-            ('OPT_2', "Centers", ""),
-            ('OPT_3', "Positive Sides", "")),
-        name="Align Mode:",
-        description="",
-        default='OPT_2')
-
-    relative_to = EnumProperty(items=(
-            ('OPT_1', "Scene Origin", ""),
-            ('OPT_2', "3D Cursor", ""),
-            ('OPT_3', "Selection", ""),
-            ('OPT_4', "Active", "")),
-        name="Relative To:",
-        description="",
-        default='OPT_4')
-
-    align_axis = EnumProperty(items=(
-            ('X', "X", ""),
-            ('Y', "Y", ""),
-            ('Z', "Z", ""),
-            ),
-                name="Align",
-                description="Align to axis",
-                options={'ENUM_FLAG'})
-
     @classmethod
     def poll(cls, context):
         return context.mode == 'OBJECT'

Modified: trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py	2011-08-19 19:10:50 UTC (rev 39562)
+++ trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py	2011-08-19 19:25:20 UTC (rev 39563)
@@ -51,20 +51,26 @@
     bl_label = "Quick Fur"
     bl_options = {'REGISTER', 'UNDO'}
 
-    density = EnumProperty(items=(
-                        ('LIGHT', "Light", ""),
-                        ('MEDIUM', "Medium", ""),
-                        ('HEAVY', "Heavy", "")),
-                name="Fur Density",
-                description="",
-                default='MEDIUM')
+    density = EnumProperty(
+            name="Fur Density",
+            items=(('LIGHT', "Light", ""),
+                   ('MEDIUM', "Medium", ""),
+                   ('HEAVY', "Heavy", "")),
+            default='MEDIUM',
+            )
+    view_percentage = IntProperty(
+            name="View %",
+            min=1, max=100,
+            soft_min=1, soft_max=100,
+            default=10,
+            )
+    length = FloatProperty(
+            name="Length",
+            min=0.001, max=100,
+            soft_min=0.01, soft_max=10,
+            default=0.1,
+            )
 
-    view_percentage = IntProperty(name="View %",
-            default=10, min=1, max=100, soft_min=1, soft_max=100)
-
-    length = FloatProperty(name="Length",
-            default=0.1, min=0.001, max=100, soft_min=0.01, soft_max=10)
-
     def execute(self, context):
         fake_context = bpy.context.copy()
         mesh_objects = [obj for obj in context.selected_objects
@@ -110,32 +116,51 @@
     bl_label = "Quick Explode"
     bl_options = {'REGISTER', 'UNDO'}
 
-    style = EnumProperty(items=(
-                        ('EXPLODE', "Explode", ""),
-                        ('BLEND', "Blend", "")),
-                name="Explode Style",
-                description="",
-                default='EXPLODE')
+    style = EnumProperty(
+            name="Explode Style",
+            items=(('EXPLODE', "Explode", ""),
+                   ('BLEND', "Blend", "")),
+            default='EXPLODE',
+            )
+    amount = IntProperty(
+            name="Amount of pieces",
+            min=2, max=10000,
+            soft_min=2, soft_max=10000,
+            default=100,
+            )
+    frame_duration = IntProperty(
+            name="Duration",
+            min=1, max=300000,
+            soft_min=1, soft_max=10000,
+            default=50,
+            )
 
-    amount = IntProperty(name="Amount of pieces",
-            default=100, min=2, max=10000, soft_min=2, soft_max=10000)
+    frame_start = IntProperty(
+            name="Start Frame",
+            min=1, max=300000,
+            soft_min=1, soft_max=10000,
+            default=1,
+            )
+    frame_end = IntProperty(
+            name="End Frame",
+            min=1, max=300000,
+            soft_min=1, soft_max=10000,

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list