diff options
| -rw-r--r-- | add_curve_ivygen.py | 69 | ||||
| -rw-r--r-- | add_curve_sapling/__init__.py | 170 | ||||
| -rw-r--r-- | add_curve_torus_knots.py | 6 | ||||
| -rw-r--r-- | add_mesh_ant_landscape.py | 18 | ||||
| -rw-r--r-- | add_mesh_extra_objects/add_mesh_gears.py | 5 | ||||
| -rw-r--r-- | animation_rotobezier.py | 18 |
6 files changed, 122 insertions, 164 deletions
diff --git a/add_curve_ivygen.py b/add_curve_ivygen.py index 3113fd8b..10ba88d0 100644 --- a/add_curve_ivygen.py +++ b/add_curve_ivygen.py @@ -607,12 +607,10 @@ class IvyGen(bpy.types.Operator): def draw(self, context): layout = self.layout - row = layout.row() - row.alignment = 'EXPAND' - row.prop(self, 'updateIvy', icon='CURVE_DATA') + + layout.prop(self, 'updateIvy', icon='CURVE_DATA') - row = layout.row() - properties = row.operator('curve.ivy_gen', text="Add New Ivy") + properties = layout.operator('curve.ivy_gen', text="Add New Ivy") properties.randomSeed = self.randomSeed properties.maxTime = self.maxTime properties.maxIvyLength = self.maxIvyLength @@ -629,53 +627,40 @@ class IvyGen(bpy.types.Operator): properties.ivyLeafSize = self.ivyLeafSize properties.updateIvy = True - row = layout.row() - prop_def = row.operator('curve.ivy_gen', text="Add New Default Ivy") + prop_def = layout.operator('curve.ivy_gen', text="Add New Default Ivy") prop_def.updateIvy = True - row = layout.row() - row.prop(self, 'growLeaves') + layout.prop(self, 'growLeaves') box = layout.box() - box.label("Generation Settings") - row = box.row() - row.prop(self, 'randomSeed') - row = box.row() - row.prop(self, 'maxTime') + box.label("Generation Settings:") + box.prop(self, 'randomSeed') + box.prop(self, 'maxTime') + box = layout.box() - box.label("Size Settings") - row = box.row() - row.prop(self, 'maxIvyLength') - row = box.row() - row.prop(self, 'ivySize') - row = box.row() - row.prop(self, 'maxFloatLength') - row = box.row() - row.prop(self, 'maxAdhesionDistance') + box.label("Size Settings:") + box.prop(self, 'maxIvyLength') + box.prop(self, 'ivySize') + box.prop(self, 'maxFloatLength') + box.prop(self, 'maxAdhesionDistance') + box = layout.box() - box.label("Weight Settings") - row = box.row() - row.prop(self, 'primaryWeight') - row = box.row() - row.prop(self, 'randomWeight') - row = box.row() - row.prop(self, 'gravityWeight') - row = box.row() - row.prop(self, 'adhesionWeight') + box.label("Weight Settings:") + box.prop(self, 'primaryWeight') + box.prop(self, 'randomWeight') + box.prop(self, 'gravityWeight') + box.prop(self, 'adhesionWeight') + box = layout.box() - box.label("Branch Settings") - row = box.row() - row.prop(self, 'branchingProbability') - row = box.row() - row.prop(self, 'ivyBranchSize') + box.label("Branch Settings:") + box.prop(self, 'branchingProbability') + box.prop(self, 'ivyBranchSize') if self.growLeaves: box = layout.box() - box.label("Leaf Settings") - row = box.row() - row.prop(self, 'ivyLeafSize') - row = box.row() - row.prop(self, 'leafProbability') + box.label("Leaf Settings:") + box.prop(self, 'ivyLeafSize') + box.prop(self, 'leafProbability') def menu_func(self, context): diff --git a/add_curve_sapling/__init__.py b/add_curve_sapling/__init__.py index 2192b617..6c8a7897 100644 --- a/add_curve_sapling/__init__.py +++ b/add_curve_sapling/__init__.py @@ -403,35 +403,29 @@ class AddTree(bpy.types.Operator): # Branch specs #layout.label('Tree Definition') - row = layout.row(align=True) - row.prop(self, 'chooseSet') + layout.prop(self, 'chooseSet') if self.chooseSet == '0': box = layout.box() - box.label('Geometry') - row = box.row() - row.prop(self, 'bevel') + box.label("Geometry:") + box.prop(self, 'bevel') + row = box.row() row.prop(self, 'bevelRes') row.prop(self, 'resU') + + box.prop(self, 'handleType') + box.prop(self, 'shape') + box.prop(self, 'seed') + box.prop(self, 'ratio') + row = box.row() - row.prop(self, 'handleType') - row = box.row() - row.prop(self, 'shape') - row = box.row() - row.prop(self, 'seed') + row.prop(self, 'scale') + row.prop(self, 'scaleV') + row = box.row() - row.prop(self, 'ratio') - row = box.row() - col = row.column() - col.prop(self, 'scale') - col = row.column() - col.prop(self, 'scaleV') - row = box.row() - col = row.column() - col.prop(self, 'scale0') - col = row.column() - col.prop(self, 'scaleV0') + row.prop(self, 'scale0') + row.prop(self, 'scaleV0') # Here we create a dict of all the properties. # Unfortunately as_keyword doesn't work with vector properties, @@ -457,110 +451,88 @@ class AddTree(bpy.types.Operator): row.menu('sapling.presetmenu', text='Load Preset') row.prop(self, 'limitImport') - if self.chooseSet == '1': + elif self.chooseSet == '1': box = layout.box() - box.label('Branch Splitting') - row = box.row() - row.prop(self, 'levels') - row = box.row() - row.prop(self, 'baseSplits') - row = box.row() - row.prop(self, 'baseSize') - row = box.row() - col = row.column() + box.label("Branch Splitting:") + box.prop(self, 'levels') + box.prop(self, 'baseSplits') + box.prop(self, 'baseSize') + + split = box.split() + + col = split.column() col.prop(self, 'branches') - col = row.column() - col.prop(self, 'segSplits') - row = box.row() - col = row.column() col.prop(self, 'splitAngle') - col = row.column() - col.prop(self, 'splitAngleV') - row = box.row() - col = row.column() col.prop(self, 'downAngle') - col = row.column() - col.prop(self, 'downAngleV') - row = box.row() - col = row.column() col.prop(self, 'rotate') - col = row.column() + + col = split.column() + col.prop(self, 'segSplits') + col.prop(self, 'splitAngleV') + col.prop(self, 'downAngleV') col.prop(self, 'rotateV') - row = box.row() - col = row.column() - col.prop(self, 'ratioPower') - if self.chooseSet == '2': + box.prop(self, 'ratioPower') + + elif self.chooseSet == '2': box = layout.box() - box.label('Branch Growth') - row = box.row() - row.prop(self, 'startCurv') - row = box.row() - row.prop(self, 'attractUp') - row = box.row() - col = row.column() + box.label("Branch Growth:") + box.prop(self, 'startCurv') + box.prop(self, 'attractUp') + + split = box.split() + + col = split.column() col.prop(self, 'length') - col = row.column() - col.prop(self, 'lengthV') - row = box.row() - col = row.column() col.prop(self, 'curve') - col = row.column() - col.prop(self, 'curveV') - row = box.row() - col = row.column() col.prop(self, 'curveBack') - col = row.column() + + col = split.column() + col.prop(self, 'lengthV') + col.prop(self, 'curveV') col.prop(self, 'taper') - row = box.row() - col = row.column() - col.prop(self, 'curveRes') + + box.column().prop(self, 'curveRes') - if self.chooseSet == '3': + elif self.chooseSet == '3': box = layout.box() - box.label('Pruning') - row = box.row() - row.prop(self, 'prune') - row = box.row() - row.prop(self, 'pruneRatio') - row = box.row() - row.prop(self, 'pruneWidth') - row = box.row() - row.prop(self, 'pruneWidthPeak') + box.label("Pruning:") + box.prop(self, 'prune') + box.prop(self, 'pruneRatio') + box.prop(self, 'pruneWidth') + box.prop(self, 'pruneWidthPeak') + row = box.row() row.prop(self, 'prunePowerHigh') row.prop(self, 'prunePowerLow') - if self.chooseSet == '4': + elif self.chooseSet == '4': box = layout.box() - box.label('Leaves') - row = box.row() - row.prop(self, 'showLeaves') - row = box.row() - row.prop(self, 'leafShape') - row = box.row() - row.prop(self, 'leaves') - row = box.row() - row.prop(self, 'leafDist') - row = box.row() - col = row.column() - col.prop(self, 'leafScale') - col = row.column() - col.prop(self, 'leafScaleX') - row = box.row() - row.prop(self, 'bend') - - if self.chooseSet == '5': + box.label("Leaves:") + box.prop(self, 'showLeaves') + box.prop(self, 'leafShape') + box.prop(self, 'leaves') + box.prop(self, 'leafDist') + + row = box.row() + row.prop(self, 'leafScale') + row.prop(self, 'leafScaleX') + + box.prop(self, 'bend') + + elif self.chooseSet == '5': box = layout.box() - box.label('Armature and Animation') + box.label("Armature and Animation:") + row = box.row() row.prop(self, 'useArm') row.prop(self, 'armAnim') + row = box.row() row.prop(self, 'windSpeed') row.prop(self, 'windGust') - row = box.row() - row.prop(self, 'frameRate') + + box.prop(self, 'frameRate') def execute(self, context): # Ensure the use of the global variables diff --git a/add_curve_torus_knots.py b/add_curve_torus_knots.py index 55ffa802..ed0329e1 100644 --- a/add_curve_torus_knots.py +++ b/add_curve_torus_knots.py @@ -174,8 +174,7 @@ class torus_knot_plus(bpy.types.Operator, AddObjectHelper): layout = self.layout # general options - col = layout.column() - col.label(text="Torus Knot Parameters") + layout.label(text="Torus Knot Parameters:") # Parameters box = layout.box() @@ -192,7 +191,7 @@ class torus_knot_plus(bpy.types.Operator, AddObjectHelper): # surface Options col = layout.column() - col.label(text="Geometry Options") + col.label(text="Geometry Options:") box = layout.box() box.prop(self, 'geo_surf') if self.geo_surf: @@ -200,6 +199,7 @@ class torus_knot_plus(bpy.types.Operator, AddObjectHelper): box.prop(self, 'geo_bRes') box.prop(self, 'geo_extrude') box.prop(self, 'geo_res') + col = layout.column() col.prop(self, 'location') col.prop(self, 'rotation') diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py index 51338004..ffcf0a27 100644 --- a/add_mesh_ant_landscape.py +++ b/add_mesh_ant_landscape.py @@ -664,47 +664,47 @@ class landscape_add(bpy.types.Operator): box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') - if self.NoiseType == '1': + elif self.NoiseType == '1': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') box.prop(self, 'mOffset') box.prop(self, 'mGain') - if self.NoiseType == '2': + elif self.NoiseType == '2': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') box.prop(self, 'mOffset') box.prop(self, 'mGain') - if self.NoiseType == '3': + elif self.NoiseType == '3': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') box.prop(self, 'mOffset') - if self.NoiseType == '4': + elif self.NoiseType == '4': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') - if self.NoiseType == '5': + elif self.NoiseType == '5': box.prop(self, 'NoiseDepth') box.prop(self, 'HardNoise') - if self.NoiseType == '6': + elif self.NoiseType == '6': box.prop(self, 'VLBasisType') box.prop(self, 'Distortion') - if self.NoiseType == '7': + elif self.NoiseType == '7': box.prop(self, 'MarbleShape') box.prop(self, 'MarbleBias') box.prop(self, 'MarbleSharp') box.prop(self, 'Distortion') box.prop(self, 'NoiseDepth') box.prop(self, 'HardNoise') - if self.NoiseType == '8': + elif self.NoiseType == '8': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') box.prop(self, 'mOffset') box.prop(self, 'Distortion') - if self.NoiseType == '9': + elif self.NoiseType == '9': box.prop(self, 'NoiseDepth') box.prop(self, 'mDimension') box.prop(self, 'mLacunarity') diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py index a8f7aac6..d43be1aa 100644 --- a/add_mesh_extra_objects/add_mesh_gears.py +++ b/add_mesh_extra_objects/add_mesh_gears.py @@ -659,15 +659,19 @@ class AddGear(bpy.types.Operator): def draw(self, context): layout = self.layout + box = layout.box() box.prop(self, 'number_of_teeth') + box = layout.box() box.prop(self, 'radius') box.prop(self, 'width') box.prop(self, 'base') + box = layout.box() box.prop(self, 'dedendum') box.prop(self, 'addendum') + box = layout.box() box.prop(self, 'angle') box.prop(self, 'skew') @@ -676,7 +680,6 @@ class AddGear(bpy.types.Operator): def execute(self, context): - verts, faces, verts_tip, verts_valley = add_gear( self.number_of_teeth, self.radius, diff --git a/animation_rotobezier.py b/animation_rotobezier.py index 5b92fc32..3f4f1003 100644 --- a/animation_rotobezier.py +++ b/animation_rotobezier.py @@ -88,8 +88,9 @@ class VIEW3D_PT_rotobezier(bpy.types.Panel): def draw(self, context): layout = self.layout - col = layout.column(align=True) + ob = context.active_object + col = layout.column(align=True) col.label(text="Keyframing:") row = col.row() row.prop(context.window_manager, "key_points") @@ -99,17 +100,15 @@ class VIEW3D_PT_rotobezier(bpy.types.Panel): row = col.row() row.operator('curve.insert_keyframe_rotobezier', icon='KEY_HLT') row.operator('curve.delete_keyframe_rotobezier', icon='KEY_DEHLT') - row = layout.row() - row.operator('curve.clear_animation_rotobezier', icon='X') + + layout.operator('curve.clear_animation_rotobezier', icon='X') col = layout.column() - col.label(text="Display:") - row = col.row() - row.operator('curve.toggle_draw_rotobezier', icon='MESH_CIRCLE') + col.operator('curve.toggle_draw_rotobezier', icon='MESH_CIRCLE') if context.mode == 'EDIT_CURVE': - row.operator('curve.toggle_handles_rotobezier', icon='CURVE_BEZCIRCLE') + col.operator('curve.toggle_handles_rotobezier', icon='CURVE_BEZCIRCLE') col = layout.column(align=True) @@ -117,9 +116,8 @@ class VIEW3D_PT_rotobezier(bpy.types.Panel): row = col.row() row.operator('curve.make_white_matte_rotobezier') row.operator('curve.make_black_matte_rotobezier') - row = layout.row() - ob = context.active_object - row.prop(ob, "pass_index") + + layout.prop(ob, "pass_index") class CURVE_OT_insert_keyframe_rotobezier(bpy.types.Operator): |