diff options
Diffstat (limited to 'release/scripts/startup/bl_operators')
7 files changed, 25 insertions, 42 deletions
diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index 9b1d054cc15..0cfe78879db 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -53,7 +53,6 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): def execute(self, context): import sys - workspace = context.workspace scene = context.scene view_layer = scene.view_layers.active lineset = view_layer.freestyle_settings.linesets.active @@ -80,7 +79,7 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): return {'CANCELLED'} # Find selected vertices in editmesh ob = context.active_object - if ob.type == 'MESH' and workspace.object_mode == 'EDIT' and ob.name != ref.name: + if ob.type == 'MESH' and ob.mode == 'EDIT' and ob.name != ref.name: bpy.ops.object.mode_set(mode='OBJECT') selected_verts = [v for v in ob.data.vertices if v.select] bpy.ops.object.mode_set(mode='EDIT') @@ -144,7 +143,6 @@ class SCENE_OT_freestyle_add_edge_marks_to_keying_set(bpy.types.Operator): def execute(self, context): # active keying set - workspace = context.workspace scene = context.scene ks = scene.keying_sets.active if ks is None: @@ -152,7 +150,7 @@ class SCENE_OT_freestyle_add_edge_marks_to_keying_set(bpy.types.Operator): ks.bl_description = "" # add data paths to the keying set ob = context.active_object - ob_mode = workspace.object_mode + ob_mode = ob.mode mesh = ob.data bpy.ops.object.mode_set(mode='OBJECT', toggle=False) for i, edge in enumerate(mesh.edges): @@ -176,7 +174,6 @@ class SCENE_OT_freestyle_add_face_marks_to_keying_set(bpy.types.Operator): def execute(self, context): # active keying set - workspace = context.workspace scene = context.scene ks = scene.keying_sets.active if ks is None: @@ -184,7 +181,7 @@ class SCENE_OT_freestyle_add_face_marks_to_keying_set(bpy.types.Operator): ks.bl_description = "" # add data paths to the keying set ob = context.active_object - ob_mode = workspace.object_mode + ob_mode = ob.mode mesh = ob.data bpy.ops.object.mode_set(mode='OBJECT', toggle=False) for i, polygon in enumerate(mesh.polygons): diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py index ccc592e80b8..c7a11c23c3f 100644 --- a/release/scripts/startup/bl_operators/mesh.py +++ b/release/scripts/startup/bl_operators/mesh.py @@ -57,9 +57,8 @@ class MeshMirrorUV(Operator): precision = self.precision double_warn = 0 - workspace = context.workspace ob = context.active_object - is_editmode = (workspace.object_mode == 'EDIT') + is_editmode = (ob.mode == 'EDIT') if is_editmode: bpy.ops.object.mode_set(mode='OBJECT', toggle=False) diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 58f3afa3d6c..566487d9d0e 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -63,13 +63,12 @@ class SelectPattern(Operator): pattern_match = (lambda a, b: fnmatch.fnmatchcase(a.upper(), b.upper())) is_ebone = False - workspace = context.workspace obj = context.object - if obj and workspace.object_mode == 'POSE': + if obj and obj.mode == 'POSE': items = obj.data.bones if not self.extend: bpy.ops.pose.select_all(action='DESELECT') - elif obj and obj.type == 'ARMATURE' and workspace.object_mode == 'EDIT': + elif obj and obj.type == 'ARMATURE' and obj.mode == 'EDIT': items = obj.data.edit_bones if not self.extend: bpy.ops.armature.select_all(action='DESELECT') @@ -249,8 +248,6 @@ class SubdivisionSet(Operator): if not relative and level < 0: self.level = level = 0 - workspace = context.workspace - def set_object_subd(obj): for mod in obj.modifiers: if mod.type == 'MULTIRES': @@ -260,18 +257,18 @@ class SubdivisionSet(Operator): for i in range(sub): bpy.ops.object.multires_subdivide(modifier="Multires") - if workspace.object_mode == 'SCULPT': + if obj.mode == 'SCULPT': if mod.sculpt_levels != level: mod.sculpt_levels = level - elif workspace.object_mode == 'OBJECT': + elif obj.mode == 'OBJECT': if mod.levels != level: mod.levels = level return else: - if workspace.object_mode == 'SCULPT': + if obj.mode == 'SCULPT': if mod.sculpt_levels + level <= mod.total_levels: mod.sculpt_levels += level - elif workspace.object_mode == 'OBJECT': + elif obj.mode == 'OBJECT': if mod.levels + level <= mod.total_levels: mod.levels += level return @@ -287,7 +284,7 @@ class SubdivisionSet(Operator): # add a new modifier try: - if workspace.object_mode == 'SCULPT': + if obj.mode == 'SCULPT': mod = obj.modifiers.new("Multires", 'MULTIRES') if level > 0: for i in range(0, level): @@ -470,9 +467,8 @@ class ShapeTransfer(Operator): @classmethod def poll(cls, context): - workspace = context.workspace obj = context.active_object - return (obj and workspace.object_mode != 'EDIT') + return (obj and obj.mode != 'EDIT') def execute(self, context): ob_act = context.active_object @@ -512,11 +508,10 @@ class JoinUVs(Operator): def _main(self, context): import array - workspace = context.workspace obj = context.active_object mesh = obj.data - is_editmode = (workspace.object_mode == 'EDIT') + is_editmode = (obj.mode == 'EDIT') if is_editmode: bpy.ops.object.mode_set(mode='OBJECT', toggle=False) diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 91a0120f6ac..27cc118d99d 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -73,10 +73,9 @@ class QuickFur(Operator): ) def execute(self, context): - workspace = context.workspace fake_context = context.copy() mesh_objects = [obj for obj in context.selected_objects - if obj.type == 'MESH' and workspace.object_mode == 'OBJECT'] + if obj.type == 'MESH' and obj.mode == 'OBJECT'] if not mesh_objects: self.report({'ERROR'}, "Select at least one mesh object") diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index dde98ce9013..61ceb3c04c4 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -558,8 +558,8 @@ def lightmap_uvpack(meshes, def unwrap(operator, context, **kwargs): - workspace = context.workspace - is_editmode = (workspace.object_mode == 'EDIT') + + is_editmode = (context.object.mode == 'EDIT') if is_editmode: bpy.ops.object.mode_set(mode='OBJECT', toggle=False) diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index f648bebed26..25783653414 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -748,8 +748,7 @@ def main(context, USER_FILL_HOLES_QUALITY = 50 # Only for hole filling. USER_VIEW_INIT = 0 # Only for hole filling. - workspace = context.workspace - is_editmode = (workspace.object_mode == 'EDIT') + is_editmode = (context.active_object.mode == 'EDIT') if is_editmode: obList = [ob for ob in [context.active_object] if ob and ob.type == 'MESH'] else: @@ -782,7 +781,7 @@ def main(context, # Toggle Edit mode - is_editmode = (workspace.object_mode == 'EDIT') + is_editmode = (context.active_object.mode == 'EDIT') if is_editmode: bpy.ops.object.mode_set(mode='OBJECT') # Assume face select mode! an annoying hack to toggle face select mode because Mesh doesn't like faceSelectMode. diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index e54ead6a5fc..18f91110053 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -30,9 +30,8 @@ class VIEW3D_OT_edit_mesh_extrude_individual_move(Operator): @classmethod def poll(cls, context): - workspace = context.workspace obj = context.active_object - return (obj is not None and workspace.object_mode == 'EDIT') + return (obj is not None and obj.mode == 'EDIT') def execute(self, context): mesh = context.object.data @@ -69,9 +68,8 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): @classmethod def poll(cls, context): - workspace = context.workspace obj = context.active_object - return (obj is not None and workspace.object_mode == 'EDIT') + return (obj is not None and obj.mode == 'EDIT') @staticmethod def extrude_region(context, use_vert_normals): @@ -119,9 +117,8 @@ class VIEW3D_OT_edit_mesh_extrude_shrink_fatten(Operator): @classmethod def poll(cls, context): - workspace = context.workspace obj = context.active_object - return (obj is not None and workspace.object_mode == 'EDIT') + return (obj is not None and obj.mode == 'EDIT') def execute(self, context): return VIEW3D_OT_edit_mesh_extrude_move.extrude_region(context, True) @@ -176,8 +173,7 @@ class VIEW3D_OT_select_or_deselect_all(Operator): def poll(cls, context): active_object = context.active_object if active_object: - workspace = context.workspace - return workspace.object_mode in {'EDIT', 'OBJECT', 'POSE'} + return active_object.mode in {'EDIT', 'OBJECT', 'POSE'} return True def invoke(self, context, event): @@ -188,9 +184,7 @@ class VIEW3D_OT_select_or_deselect_all(Operator): active_object = context.active_object if active_object: - workspace = context.workspace - object_mode = workspace.object_mode - if object_mode == 'EDIT': + if active_object.mode == 'EDIT': if active_object.type == 'MESH': bpy.ops.mesh.select_all(action='DESELECT') elif active_object.type == 'CURVE': @@ -203,9 +197,9 @@ class VIEW3D_OT_select_or_deselect_all(Operator): bpy.ops.mball.select_all(action='DESELECT') elif active_object.type == 'ARMATURE': bpy.ops.armature.select_all(action='DESELECT') - elif object_mode == 'POSE': + elif active_object.mode == 'POSE': bpy.ops.pose.select_all(action='DESELECT') - elif object_mode == 'PARTICLE_EDIT': + elif active_object.mode == 'PARTICLE_EDIT': bpy.ops.particle.select_all(action='DESELECT') else: bpy.ops.object.select_all(action='DESELECT') |