From e63642f9cd57d12b0d4b4036e477d61012714181 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 14 Mar 2019 10:47:25 +1100 Subject: Fix T60172: UV smart project fails for unselected active object Support multi-object edit-mode too. --- .../scripts/startup/bl_operators/uvcalc_smart_project.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'release/scripts/startup/bl_operators/uvcalc_smart_project.py') diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 6eb07d5c19f..34aae1b9433 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -728,8 +728,14 @@ def main(context, USER_FILL_HOLES_QUALITY = 50 # Only for hole filling. USER_VIEW_INIT = 0 # Only for hole filling. - obList = [ob for ob in context.selected_editable_objects if ob and ob.type == 'MESH'] - is_editmode = (context.active_object.mode == 'EDIT') + is_editmode = (context.mode == 'EDIT_MESH') + if is_editmode: + obList = context.objects_in_mode_unique_data + else: + obList = [ + ob for ob in context.selected_editable_objects + if ob.type == 'MESH' and ob.data.library is None + ] if not is_editmode: USER_ONLY_SELECTED_FACES = False @@ -737,12 +743,6 @@ def main(context, if not obList: raise Exception("error, no selected mesh objects") - # Reuse variable - if len(obList) == 1: - ob = "Unwrap %i Selected Mesh" - else: - ob = "Unwrap %i Selected Meshes" - # Convert from being button types USER_PROJECTION_LIMIT_CONVERTED = cos(USER_PROJECTION_LIMIT * DEG_TO_RAD) USER_PROJECTION_LIMIT_HALF_CONVERTED = cos((USER_PROJECTION_LIMIT / 2) * DEG_TO_RAD) -- cgit v1.2.3