From 1923a5c1345925c69fd3c8451c0e79bf5502f814 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 7 Aug 2014 04:36:56 +1000 Subject: [PATCH] UI: move button to set dupli-offset into group menu --- release/scripts/startup/bl_operators/object.py | 11 ++--------- release/scripts/startup/bl_ui/properties_object.py | 8 ++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index d1d2341a614..c1f75c74bb4 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -775,22 +775,15 @@ class DupliOffsetFromCursor(Operator): bl_label = "Set Offset From Cursor" bl_options = {'REGISTER', 'UNDO'} - group = IntProperty( - name="Group", - description="Group index to set offset for", - default=0, - ) - @classmethod def poll(cls, context): return (context.active_object is not None) def execute(self, context): scene = context.scene - ob = context.active_object - group = self.group + group = context.group - ob.users_group[group].dupli_offset = scene.cursor_location + group.dupli_offset = scene.cursor_location return {'FINISHED'} diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index b3551c52192..e6d6a3952ea 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -159,6 +159,8 @@ class GROUP_MT_specials(Menu): layout.operator("object.group_unlink", icon='X') layout.operator("object.grouped_select") + layout.operator("object.dupli_offset_from_cursor") + class OBJECT_PT_groups(ObjectButtonsPanel, Panel): bl_label = "Groups" @@ -175,8 +177,6 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel): row.operator("object.group_add", text="Add to Group") row.operator("object.group_add", text="", icon='ZOOMIN') - # XXX, this is bad practice, yes, I wrote it :( - campbell - index = 0 obj_name = obj.name for group in bpy.data.groups: # XXX this is slow and stupid!, we need 2 checks, one thats fast @@ -201,10 +201,6 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel): col = split.column() col.prop(group, "dupli_offset", text="") - props = col.operator("object.dupli_offset_from_cursor", text="From Cursor") - props.group = index - index += 1 - class OBJECT_PT_display(ObjectButtonsPanel, Panel): bl_label = "Display"