diff options
| -rw-r--r-- | add_curve_aceous_galore.py | 116 | ||||
| -rw-r--r-- | add_curve_torus_knots.py | 41 | ||||
| -rw-r--r-- | add_mesh_BoltFactory/Boltfactory.py | 56 | ||||
| -rw-r--r-- | add_mesh_ant_landscape.py | 114 | ||||
| -rw-r--r-- | add_mesh_gears.py | 38 | ||||
| -rw-r--r-- | curve_simplify.py | 36 | ||||
| -rw-r--r-- | io_import_images_as_planes.py | 16 | ||||
| -rw-r--r-- | space_view3d_copy_attributes.py | 13 |
8 files changed, 212 insertions, 218 deletions
diff --git a/add_curve_aceous_galore.py b/add_curve_aceous_galore.py index f1414b8c..0b120d07 100644 --- a/add_curve_aceous_galore.py +++ b/add_curve_aceous_galore.py @@ -972,94 +972,94 @@ class Curveaceous_galore(bpy.types.Operator): # general options col = layout.column() - col.prop(self.properties, 'GalloreType') + col.prop(self, 'GalloreType') col.label(text=self.GalloreType+" Options") # options per GalloreType box = layout.box() if self.GalloreType == 'Profile': - box.prop(self.properties, 'ProfileCurveType') - box.prop(self.properties, 'ProfileCurvevar1') - box.prop(self.properties, 'ProfileCurvevar2') + box.prop(self, 'ProfileCurveType') + box.prop(self, 'ProfileCurvevar1') + box.prop(self, 'ProfileCurvevar2') if self.GalloreType == 'Miscellaneous': - box.prop(self.properties, 'MiscCurveType') - box.prop(self.properties, 'MiscCurvevar1') - box.prop(self.properties, 'MiscCurvevar2') - #box.prop(self.properties, 'MiscCurvevar3') # doesn't seem to do anything + box.prop(self, 'MiscCurveType') + box.prop(self, 'MiscCurvevar1') + box.prop(self, 'MiscCurvevar2') + #box.prop(self, 'MiscCurvevar3') # doesn't seem to do anything if self.GalloreType == 'Flower': - box.prop(self.properties, 'petals') - box.prop(self.properties, 'petalWidth') - box.prop(self.properties, 'innerRadius') - box.prop(self.properties, 'outerRadius') + box.prop(self, 'petals') + box.prop(self, 'petalWidth') + box.prop(self, 'innerRadius') + box.prop(self, 'outerRadius') if self.GalloreType == 'Star': - box.prop(self.properties, 'starPoints') - box.prop(self.properties, 'starTwist') - box.prop(self.properties, 'innerRadius') - box.prop(self.properties, 'outerRadius') + box.prop(self, 'starPoints') + box.prop(self, 'starTwist') + box.prop(self, 'innerRadius') + box.prop(self, 'outerRadius') if self.GalloreType == 'Arc': - box.prop(self.properties, 'arcSides') - box.prop(self.properties, 'arcType') # has only one Type? - box.prop(self.properties, 'startAngle') - box.prop(self.properties, 'endAngle') - box.prop(self.properties, 'innerRadius') # doesn't seem to do anything - box.prop(self.properties, 'outerRadius') + box.prop(self, 'arcSides') + box.prop(self, 'arcType') # has only one Type? + box.prop(self, 'startAngle') + box.prop(self, 'endAngle') + box.prop(self, 'innerRadius') # doesn't seem to do anything + box.prop(self, 'outerRadius') if self.GalloreType == 'Cogwheel': - box.prop(self.properties, 'teeth') - box.prop(self.properties, 'bevel') - box.prop(self.properties, 'innerRadius') - box.prop(self.properties, 'middleRadius') - box.prop(self.properties, 'outerRadius') + box.prop(self, 'teeth') + box.prop(self, 'bevel') + box.prop(self, 'innerRadius') + box.prop(self, 'middleRadius') + box.prop(self, 'outerRadius') if self.GalloreType == 'Nsided': - box.prop(self.properties, 'Nsides') - box.prop(self.properties, 'outerRadius', text='Radius') + box.prop(self, 'Nsides') + box.prop(self, 'outerRadius', text='Radius') if self.GalloreType == 'Splat': - box.prop(self.properties, 'splatSides') - box.prop(self.properties, 'outerRadius') - box.prop(self.properties, 'splatScale') - box.prop(self.properties, 'seed') - box.prop(self.properties, 'basis') + box.prop(self, 'splatSides') + box.prop(self, 'outerRadius') + box.prop(self, 'splatScale') + box.prop(self, 'seed') + box.prop(self, 'basis') if self.GalloreType == 'Helix': - box.prop(self.properties, 'helixPoints') - box.prop(self.properties, 'helixHeight') - box.prop(self.properties, 'helixWidth') - box.prop(self.properties, 'helixStart') - box.prop(self.properties, 'helixEnd') - box.prop(self.properties, 'helix_a') - box.prop(self.properties, 'helix_b') + box.prop(self, 'helixPoints') + box.prop(self, 'helixHeight') + box.prop(self, 'helixWidth') + box.prop(self, 'helixStart') + box.prop(self, 'helixEnd') + box.prop(self, 'helix_a') + box.prop(self, 'helix_b') if self.GalloreType == 'Cycloid': - box.prop(self.properties, 'cycloPoints') - #box.prop(self.properties, 'cycloType') # needs the other types first - box.prop(self.properties, 'cycloStart') - box.prop(self.properties, 'cycloEnd') - box.prop(self.properties, 'cyclo_a') - box.prop(self.properties, 'cyclo_b') - box.prop(self.properties, 'cyclo_d') + box.prop(self, 'cycloPoints') + #box.prop(self, 'cycloType') # needs the other types first + box.prop(self, 'cycloStart') + box.prop(self, 'cycloEnd') + box.prop(self, 'cyclo_a') + box.prop(self, 'cyclo_b') + box.prop(self, 'cyclo_d') col = layout.column() col.label(text="Output Curve Type") row = layout.row() - row.prop(self.properties, 'outputType', expand=True) + row.prop(self, 'outputType', expand=True) col = layout.column() col.label(text="Curve Options") # output options box = layout.box() if self.outputType == 'NURBS': - box.row().prop(self.properties, 'shape', expand=True) - #box.prop(self.properties, 'use_cyclic_u') - #box.prop(self.properties, 'endp_u') - box.prop(self.properties, 'order_u') + box.row().prop(self, 'shape', expand=True) + #box.prop(self, 'use_cyclic_u') + #box.prop(self, 'endp_u') + box.prop(self, 'order_u') if self.outputType == 'POLY': - box.row().prop(self.properties, 'shape', expand=True) - #box.prop(self.properties, 'use_cyclic_u') + box.row().prop(self, 'shape', expand=True) + #box.prop(self, 'use_cyclic_u') if self.outputType == 'BEZIER': - box.row().prop(self.properties, 'shape', expand=True) - box.row().prop(self.properties, 'handleType', expand=True) - #box.prop(self.properties, 'use_cyclic_u') + box.row().prop(self, 'shape', expand=True) + box.row().prop(self, 'handleType', expand=True) + #box.prop(self, 'use_cyclic_u') ##### POLL ##### diff --git a/add_curve_torus_knots.py b/add_curve_torus_knots.py index 1bf47cda..7c370c5e 100644 --- a/add_curve_torus_knots.py +++ b/add_curve_torus_knots.py @@ -238,38 +238,37 @@ class torus_knot_plus(bpy.types.Operator): ##### DRAW ##### def draw(self, context): - props = self.properties layout = self.layout # general options col = layout.column() - #col.prop(props, 'KnotType') waits for more knottypes + #col.prop(self, 'KnotType') waits for more knottypes col.label(text="Torus Knot Parameters") # Parameters box = layout.box() - box.prop(props, 'torus_res') - box.prop(props, 'torus_w') - box.prop(props, 'torus_h') - box.prop(props, 'torus_p') - box.prop(props, 'torus_q') - box.prop(props, 'options_plus') - if props.options_plus: - box.prop(props, 'torus_u') - box.prop(props, 'torus_v') - box.prop(props, 'torus_rounds') + box.prop(self, 'torus_res') + box.prop(self, 'torus_w') + box.prop(self, 'torus_h') + box.prop(self, 'torus_p') + box.prop(self, 'torus_q') + box.prop(self, 'options_plus') + if self.options_plus: + box.prop(self, 'torus_u') + box.prop(self, 'torus_v') + box.prop(self, 'torus_rounds') # surface Options col = layout.column() col.label(text="Geometry Options") box = layout.box() - box.prop(props, 'geo_surf') - if props.geo_surf: - box.prop(props, 'geo_bDepth') - box.prop(props, 'geo_bRes') - box.prop(props, 'geo_extrude') - #box.prop(props, 'geo_width') # not really good - box.prop(props, 'geo_res') + box.prop(self, 'geo_surf') + if self.geo_surf: + box.prop(self, 'geo_bDepth') + box.prop(self, 'geo_bRes') + box.prop(self, 'geo_extrude') + #box.prop(self, 'geo_width') # not really good + box.prop(self, 'geo_res') ##### POLL ##### @classmethod @@ -281,14 +280,12 @@ class torus_knot_plus(bpy.types.Operator): # turn off undo undo = bpy.context.user_preferences.edit.use_global_undo bpy.context.user_preferences.edit.use_global_undo = False - - props = self.properties if not self.options_plus: self.torus_rounds = self.torus_p # main function - main(context, props, self.align_matrix) + main(context, self, self.align_matrix) # restore pre operator undo state bpy.context.user_preferences.edit.use_global_undo = undo diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py index 6a629758..61da6ac3 100644 --- a/add_mesh_BoltFactory/Boltfactory.py +++ b/add_mesh_BoltFactory/Boltfactory.py @@ -212,59 +212,59 @@ class add_mesh_bolt(bpy.types.Operator): col = layout.column() #ENUMS - col.prop(self.properties, 'bf_Model_Type') - col.prop(self.properties, 'bf_presets') + col.prop(self, 'bf_Model_Type') + col.prop(self, 'bf_presets') col.separator() #Bit if self.bf_Model_Type == 'bf_Model_Bolt': - col.prop(self.properties, 'bf_Bit_Type') + col.prop(self, 'bf_Bit_Type') if self.bf_Bit_Type == 'bf_Bit_None': DoNothing = 1; elif self.bf_Bit_Type == 'bf_Bit_Allen': - col.prop(self.properties,'bf_Allen_Bit_Depth') - col.prop(self.properties,'bf_Allen_Bit_Flat_Distance') + col.prop(self, 'bf_Allen_Bit_Depth') + col.prop(self, 'bf_Allen_Bit_Flat_Distance') elif self.bf_Bit_Type == 'bf_Bit_Philips': - col.prop(self.properties,'bf_Phillips_Bit_Depth') - col.prop(self.properties,'bf_Philips_Bit_Dia') + col.prop(self, 'bf_Phillips_Bit_Depth') + col.prop(self, 'bf_Philips_Bit_Dia') col.separator() #Head if self.bf_Model_Type == 'bf_Model_Bolt': - col.prop(self.properties, 'bf_Head_Type') + col.prop(self, 'bf_Head_Type') if self.bf_Head_Type == 'bf_Head_Hex': - col.prop(self.properties, 'bf_Hex_Head_Height') - col.prop(self.properties, 'bf_Hex_Head_Flat_Distance') + col.prop(self, 'bf_Hex_Head_Height') + col.prop(self, 'bf_Hex_Head_Flat_Distance') elif self.bf_Head_Type == 'bf_Head_Cap': - col.prop(self.properties,'bf_Cap_Head_Height') - col.prop(self.properties,'bf_Cap_Head_Dia') + col.prop(self, 'bf_Cap_Head_Height') + col.prop(self, 'bf_Cap_Head_Dia') elif self.bf_Head_Type == 'bf_Head_Dome': - col.prop(self.properties,'bf_Dome_Head_Dia') + col.prop(self, 'bf_Dome_Head_Dia') elif self.bf_Head_Type == 'bf_Head_Pan': - col.prop(self.properties,'bf_Pan_Head_Dia') + col.prop(self, 'bf_Pan_Head_Dia') elif self.bf_Head_Type == 'bf_Head_CounterSink': - col.prop(self.properties,'bf_CounterSink_Head_Dia') + col.prop(self, 'bf_CounterSink_Head_Dia') col.separator() #Shank if self.bf_Model_Type == 'bf_Model_Bolt': col.label(text='Shank') - col.prop(self.properties, 'bf_Shank_Length') - col.prop(self.properties, 'bf_Shank_Dia') + col.prop(self, 'bf_Shank_Length') + col.prop(self, 'bf_Shank_Dia') col.separator() #Nut if self.bf_Model_Type == 'bf_Model_Nut': - col.prop(self.properties, 'bf_Nut_Type') - col.prop(self.properties,'bf_Hex_Nut_Height') - col.prop(self.properties,'bf_Hex_Nut_Flat_Distance') + col.prop(self, 'bf_Nut_Type') + col.prop(self, 'bf_Hex_Nut_Height') + col.prop(self, 'bf_Hex_Nut_Flat_Distance') #Thread col.label(text='Thread') if self.bf_Model_Type == 'bf_Model_Bolt': - col.prop(self.properties,'bf_Thread_Length') - col.prop(self.properties,'bf_Major_Dia') - col.prop(self.properties,'bf_Minor_Dia') - col.prop(self.properties,'bf_Pitch') - col.prop(self.properties,'bf_Crest_Percent') - col.prop(self.properties,'bf_Root_Percent') + col.prop(self, 'bf_Thread_Length') + col.prop(self, 'bf_Major_Dia') + col.prop(self, 'bf_Minor_Dia') + col.prop(self, 'bf_Pitch') + col.prop(self, 'bf_Crest_Percent') + col.prop(self, 'bf_Root_Percent') @@ -280,7 +280,7 @@ class add_mesh_bolt(bpy.types.Operator): if not self.last_preset or self.bf_presets != self.last_preset: #print('setting Preset', self.bf_presets) - setProps(self.properties, self.bf_presets, self.presetsPath) + setProps(self, self.bf_presets, self.presetsPath) self.bf_Phillips_Bit_Depth = float(Get_Phillips_Bit_Height(self.bf_Philips_Bit_Dia)) self.last_preset = self.bf_presets @@ -290,7 +290,7 @@ class add_mesh_bolt(bpy.types.Operator): #self.bf_Philips_Bit_Dia = self.bf_Pan_Head_Dia*(1.82/5.6) #self.bf_Minor_Dia = self.bf_Major_Dia - (1.082532 * self.bf_Pitch) - Create_New_Mesh(self.properties, context, self.align_matrix) + Create_New_Mesh(self, context, self.align_matrix) return {'FINISHED'} diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py index 016274da..3a3fbca4 100644 --- a/add_mesh_ant_landscape.py +++ b/add_mesh_ant_landscape.py @@ -741,80 +741,80 @@ class landscape_add(bpy.types.Operator): layout = self.layout box = layout.box() - box.prop(self.properties, 'AutoUpdate') - box.prop(self.properties, 'SphereMesh') - box.prop(self.properties, 'SmoothMesh') - box.prop(self.properties, 'Subdivision') - box.prop(self.properties, 'MeshSize') + box.prop(self, 'AutoUpdate') + box.prop(self, 'SphereMesh') + box.prop(self, 'SmoothMesh') + box.prop(self, 'Subdivision') + box.prop(self, 'MeshSize') box = layout.box() - box.prop(self.properties, 'NoiseType') + box.prop(self, 'NoiseType') if self.NoiseType != '7': - box.prop(self.properties, 'BasisType') - box.prop(self.properties, 'RandomSeed') - box.prop(self.properties, 'NoiseSize') + box.prop(self, 'BasisType') + box.prop(self, 'RandomSeed') + box.prop(self, 'NoiseSize') if self.NoiseType == '0': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') if self.NoiseType == '1': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') - box.prop(self.properties, 'mOffset') - box.prop(self.properties, 'mGain') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') + box.prop(self, 'mOffset') + box.prop(self, 'mGain') if self.NoiseType == '2': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') - box.prop(self.properties, 'mOffset') - box.prop(self.properties, 'mGain') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') + box.prop(self, 'mOffset') + box.prop(self, 'mGain') if self.NoiseType == '3': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') - box.prop(self.properties, 'mOffset') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') + box.prop(self, 'mOffset') if self.NoiseType == '4': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') if self.NoiseType == '5': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'HardNoise') + box.prop(self, 'NoiseDepth') + box.prop(self, 'HardNoise') if self.NoiseType == '6': - box.prop(self.properties, 'VLBasisType') - box.prop(self.properties, 'Distortion') + box.prop(self, 'VLBasisType') + box.prop(self, 'Distortion') if self.NoiseType == '7': - box.prop(self.properties, 'MarbleShape') - box.prop(self.properties, 'MarbleBias') - box.prop(self.properties, 'MarbleSharp') - box.prop(self.properties, 'Distortion') - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'HardNoise') + 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': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') - box.prop(self.properties, 'mOffset') - box.prop(self.properties, 'Distortion') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') + box.prop(self, 'mOffset') + box.prop(self, 'Distortion') if self.NoiseType == '9': - box.prop(self.properties, 'NoiseDepth') - box.prop(self.properties, 'mDimension') - box.prop(self.properties, 'mLacunarity') - box.prop(self.properties, 'mOffset') - box.prop(self.properties, 'Distortion') + box.prop(self, 'NoiseDepth') + box.prop(self, 'mDimension') + box.prop(self, 'mLacunarity') + box.prop(self, 'mOffset') + box.prop(self, 'Distortion') box = layout.box() - box.prop(self.properties, 'Invert') - box.prop(self.properties, 'Height') - box.prop(self.properties, 'Offset') - box.prop(self.properties, 'Plateaulevel') - box.prop(self.properties, 'Sealevel') + box.prop(self, 'Invert') + box.prop(self, 'Height') + box.prop(self, 'Offset') + box.prop(self, 'Plateaulevel') + box.prop(self, 'Sealevel') if self.SphereMesh == False: - box.prop(self.properties, 'Falloff') - box.prop(self.properties, 'StrataType') + box.prop(self, 'Falloff') + box.prop(self, 'StrataType') if self.StrataType != '0': - box.prop(self.properties, 'Strata') + box.prop(self, 'Strata') ###------------------------------------------------------------ # Execute diff --git a/add_mesh_gears.py b/add_mesh_gears.py index c065e27c..a0a47246 100644 --- a/add_mesh_gears.py +++ b/add_mesh_gears.py @@ -751,19 +751,19 @@ class AddGear(bpy.types.Operator): def draw(self, context): layout = self.layout box = layout.box() - box.prop(self.properties, 'number_of_teeth') + box.prop(self, 'number_of_teeth') box = layout.box() - box.prop(self.properties, 'radius') - box.prop(self.properties, 'width') - box.prop(self.properties, 'base') + box.prop(self, 'radius') + box.prop(self, 'width') + box.prop(self, 'base') box = layout.box() - box.prop(self.properties, 'dedendum') - box.prop(self.properties, 'addendum') + box.prop(self, 'dedendum') + box.prop(self, 'addendum') box = layout.box() - box.prop(self.properties, 'angle') - box.prop(self.properties, 'skew') - box.prop(self.properties, 'conangle') - box.prop(self.properties, 'crown') + box.prop(self, 'angle') + box.prop(self, 'skew') + box.prop(self, 'conangle') + box.prop(self, 'crown') def execute(self, context): @@ -858,17 +858,17 @@ class AddWormGear(bpy.types.Operator): def draw(self, context): layout = self.layout box = layout.box() - box.prop(self.properties, 'number_of_teeth') - box.prop(self.properties, 'number_of_rows') - box.prop(self.properties, 'radius') - box.prop(self.properties, 'row_height') + box.prop(self, 'number_of_teeth') + box.prop(self, 'number_of_rows') + box.prop(self, 'radius') + box.prop(self, 'row_height') box = layout.box() - box.prop(self.properties, 'addendum') - box.prop(self.properties, 'dedendum') + box.prop(self, 'addendum') + box.prop(self, 'dedendum') box = layout.box() - box.prop(self.properties, 'angle') - box.prop(self.properties, 'skew') - box.prop(self.properties, 'crown') + box.prop(self, 'angle') + box.prop(self, 'skew') + box.prop(self, 'crown') def execute(self, context): diff --git a/curve_simplify.py b/curve_simplify.py index 2f430b6d..249fddf3 100644 --- a/curve_simplify.py +++ b/curve_simplify.py @@ -402,26 +402,26 @@ class GRAPH_OT_simplify(bpy.types.Operator): layout = self.layout col = layout.column() col.label('Mode:') - col.prop(self.properties, 'mode', expand=True) + col.prop(self, 'mode', expand=True) if self.mode == 'distance': box = layout.box() box.label(self.mode, icon='ARROW_LEFTRIGHT') - box.prop(self.properties, 'error', expand=True) + box.prop(self, 'error', expand=True) if self.mode == 'curvature': box = layout.box() box.label('degree', icon='SMOOTHCURVE') - box.prop(self.properties, 'pointsNr', expand=True) + box.prop(self, 'pointsNr', expand=True) box.label('threshold', icon='PARTICLE_PATH') - box.prop(self.properties, 'k_thresh', expand=True) + box.prop(self, 'k_thresh', expand=True) box.label('distance', icon='ARROW_LEFTRIGHT') - box.prop(self.properties, 'dis_error', expand=True) + box.prop(self, 'dis_error', expand=True) col = layout.column() ''' def draw(self, context): layout = self.layout col = layout.column() - col.prop(self.properties, 'error', expand=True) + col.prop(self, 'error', expand=True) ## Check for animdata @classmethod @@ -516,35 +516,35 @@ class CURVE_OT_simplify(bpy.types.Operator): layout = self.layout col = layout.column() col.label('Mode:') - col.prop(self.properties, 'mode', expand=True) + col.prop(self, 'mode', expand=True) if self.mode == 'distance': box = layout.box() box.label(self.mode, icon='ARROW_LEFTRIGHT') - box.prop(self.properties, 'error', expand=True) + box.prop(self, 'error', expand=True) if self.mode == 'curvature': box = layout.box() box.label('degree', icon='SMOOTHCURVE') - box.prop(self.properties, 'pointsNr', expand=True) + box.prop(self, 'pointsNr', expand=True) box.label('threshold', icon='PARTICLE_PATH') - box.prop(self.properties, 'k_thresh', expand=True) + box.prop(self, 'k_thresh', expand=True) box.label('distance', icon='ARROW_LEFTRIGHT') - box.prop(self.properties, 'dis_error', expand=True) + box.prop(self, 'dis_error', expand=True) col = layout.column() col.separator() - col.prop(self.properties, 'output', text='Output', icon='OUTLINER_OB_CURVE') + col.prop(self, 'output', text='Output', icon='OUTLINER_OB_CURVE') if self.output == 'NURBS': - col.prop(self.properties, 'degreeOut', expand=True) - col.prop(self.properties, 'keepShort', expand=True) + col.prop(self, 'degreeOut', expand=True) + col.prop(self, 'keepShort', expand=True) ''' def draw(self, context): layout = self.layout col = layout.column() - col.prop(self.properties, 'error', expand=True) - col.prop(self.properties, 'output', text='Output', icon='OUTLINER_OB_CURVE') + col.prop(self, 'error', expand=True) + col.prop(self, 'output', text='Output', icon='OUTLINER_OB_CURVE') if self.output == 'NURBS': - col.prop(self.properties, 'degreeOut', expand=True) - col.prop(self.properties, 'keepShort', expand=True) + col.prop(self, 'degreeOut', expand=True) + col.prop(self, 'keepShort', expand=True) ## Check for curve diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py index f8efd112..8ce9b4c7 100644 --- a/io_import_images_as_planes.py +++ b/io_import_images_as_planes.py @@ -448,18 +448,18 @@ class ImportImagesAsPlanes(bpy.types.Operator): layout = self.layout box = layout.box() box.label('Filter:', icon='FILTER') - box.prop(self.properties, 'fromDirectory') - box.prop(self.properties, 'extension', icon='FILE_IMAGE') + box.prop(self, 'fromDirectory') + box.prop(self, 'extension', icon='FILE_IMAGE') box = layout.box() box.label('Material mappings:', icon='MATERIAL') - box.prop(self.properties, 'use_shadeless') - box.prop(self.properties, 'transp') - box.prop(self.properties, 'use_premultiply') - box.prop(self.properties, 'transp_method', expand=True) + box.prop(self, 'use_shadeless') + box.prop(self, 'transp') + box.prop(self, 'use_premultiply') + box.prop(self, 'transp_method', expand=True) box = layout.box() box.label('Plane dimensions:', icon='ARROW_LEFTRIGHT') - box.prop(self.properties, 'useDim') - box.prop(self.properties, 'factor', expand=True) + box.prop(self, 'useDim') + box.prop(self, 'factor', expand=True) def execute(self, context): # File Path diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py index aed81ef1..a47ba171 100644 --- a/space_view3d_copy_attributes.py +++ b/space_view3d_copy_attributes.py @@ -236,9 +236,8 @@ class CopySelectedPoseConstraints(bpy.types.Operator): def draw(self, context): layout = self.layout - props = self.properties for idx, const in enumerate(context.active_pose_bone.constraints): - layout.prop(props, 'selection', index=idx, text=const.name, + layout.prop(self, "selection", index=idx, text=const.name, toggle=True) def execute(self, context): @@ -490,9 +489,8 @@ class CopySelectedObjectConstraints(bpy.types.Operator): def draw(self, context): layout = self.layout - props = self.properties for idx, const in enumerate(context.active_object.constraints): - layout.prop(props, 'selection', index=idx, text=const.name, + layout.prop(self, "selection", index=idx, text=const.name, toggle=True) def execute(self, context): @@ -521,9 +519,8 @@ class CopySelectedObjectModifiers(bpy.types.Operator): def draw(self, context): layout = self.layout - props = self.properties for idx, const in enumerate(context.active_object.modifiers): - layout.prop(props, 'selection', index=idx, text=const.name, + layout.prop(self, 'selection', index=idx, text=const.name, toggle=True) def execute(self, context): @@ -653,8 +650,8 @@ class MESH_OT_CopyFaceSettings(bpy.types.Operator): def execute(self, context): mesh = context.object.data - mode = self.properties.get('mode', 'MODE') - layername = self.properties.get('layer') + mode = getattr(self, 'mode', 'MODE') + layername = getattr(self, 'layer', None) # Switching out of edit mode updates the selected state of faces and # makes the data from the uv texture and vertex color layers available. |