diff options
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 15 | ||||
| -rw-r--r-- | release/scripts/modules/keyingsets_utils.py | 9 |
2 files changed, 8 insertions, 16 deletions
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index 31938f3ad3e..04b3858bb0d 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -119,7 +119,6 @@ def object_data_add(context, obdata, operator=None, name=None): :return: the newly created object in the scene. :rtype: :class:`bpy.types.Object` """ - workspace = context.workspace scene = context.scene layer = context.view_layer layer_collection = context.layer_collection @@ -147,9 +146,9 @@ def object_data_add(context, obdata, operator=None, name=None): # caused because entering edit-mode does not add a empty undo slot! if context.user_preferences.edit.use_enter_edit_mode: if not (obj_act and - obj_act.type == obj_new.type and - workspace.object_mode == 'EDIT' - ): + obj_act.mode == 'EDIT' and + obj_act.type == obj_new.type): + _obdata = bpy.data.meshes.new(name) obj_act = bpy.data.objects.new(_obdata.name, _obdata) obj_act.matrix_world = obj_new.matrix_world @@ -160,10 +159,7 @@ def object_data_add(context, obdata, operator=None, name=None): bpy.ops.ed.undo_push(message="Enter Editmode") # XXX - if (obj_act and - obj_act.type == obj_new.type and - workspace.object_mode == 'EDIT' - ): + if obj_act and obj_act.mode == 'EDIT' and obj_act.type == obj_new.type: bpy.ops.mesh.select_all(action='DESELECT') obj_act.select_set(action='SELECT') bpy.ops.object.mode_set(mode='OBJECT') @@ -253,10 +249,9 @@ def object_image_guess(obj, bm=None): first checking the texture-faces, then the material. """ # TODO, cycles/nodes materials - workspace = context.workspace me = obj.data if bm is None: - if workspace.object_mode == 'EDIT': + if obj.mode == 'EDIT': import bmesh bm = bmesh.from_edit_mesh(me) diff --git a/release/scripts/modules/keyingsets_utils.py b/release/scripts/modules/keyingsets_utils.py index 40e74e27ed2..7ce5f3e029b 100644 --- a/release/scripts/modules/keyingsets_utils.py +++ b/release/scripts/modules/keyingsets_utils.py @@ -57,10 +57,9 @@ def path_add_property(path, prop): # selected objects (active object must be in object mode) def RKS_POLL_selected_objects(ksi, context): - workspace = context.workspace ob = context.active_object if ob: - return workspace.object_mode == 'OBJECT' + return ob.mode == 'OBJECT' else: return bool(context.selected_objects) @@ -68,9 +67,8 @@ def RKS_POLL_selected_objects(ksi, context): # selected bones def RKS_POLL_selected_bones(ksi, context): # we must be in Pose Mode, and there must be some bones selected - workspace = context.workspace ob = context.active_object - if ob and workspace.object_mode == 'POSE': + if ob and ob.mode == 'POSE': if context.active_pose_bone or context.selected_pose_bones: return True @@ -89,9 +87,8 @@ def RKS_POLL_selected_items(ksi, context): # all selected objects or pose bones, depending on which we've got def RKS_ITER_selected_item(ksi, context, ks): - workspace = context.workspace ob = context.active_object - if ob and workspace.object_mode == 'POSE': + if ob and ob.mode == 'POSE': for bone in context.selected_pose_bones: ksi.generate(context, ks, bone) else: |