From d541a200c2fcac497ec2a52e6d3c8f31f7032f29 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 23 Oct 2011 00:53:50 +0000 Subject: rename user interface operator properties from 'op' to 'props' --- .../scripts/startup/bl_ui/properties_data_mesh.py | 6 ++---- release/scripts/startup/bl_ui/properties_scene.py | 3 +-- release/scripts/startup/bl_ui/space_image.py | 24 +++++++++++----------- .../scripts/startup/bl_ui/space_userpref_keymap.py | 6 ++---- release/scripts/startup/bl_ui/space_view3d.py | 5 ++--- release/scripts/templates/driver_functions.py | 1 + 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index ff19ece8f94..425b7a601c8 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -51,8 +51,7 @@ class MESH_MT_shape_key_specials(Menu): layout.operator("object.shape_key_transfer", icon='COPY_ID') # icon is not ideal layout.operator("object.join_shapes", icon='COPY_ID') # icon is not ideal layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT') - op = layout.operator("object.shape_key_add", icon='ZOOMIN', text="New Shape From Mix") - op.from_mix = True + layout.operator("object.shape_key_add", icon='ZOOMIN', text="New Shape From Mix").from_mix = True class MeshButtonsPanel(): @@ -207,8 +206,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel): col = row.column() sub = col.column(align=True) - op = sub.operator("object.shape_key_add", icon='ZOOMIN', text="") - op.from_mix = False + sub.operator("object.shape_key_add", icon='ZOOMIN', text="").from_mix = False sub.operator("object.shape_key_remove", icon='ZOOMOUT', text="") sub.menu("MESH_MT_shape_key_specials", icon='DOWNARROW_HLT', text="") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 167cead9a3b..d3859a78bea 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -115,8 +115,7 @@ class SCENE_PT_keying_sets(SceneButtonsPanel, Panel): subcol = col.column() subcol.operator_context = 'INVOKE_DEFAULT' - op = subcol.operator("anim.keying_set_export", text="Export to File") - op.filepath = "keyingset.py" + subcol.operator("anim.keying_set_export", text="Export to File").filepath = "keyingset.py" col = row.column() col.label(text="Keyframing Settings:") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 051854a28f1..50db989a2e2 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -157,24 +157,24 @@ class IMAGE_MT_image_invert(Menu): def draw(self, context): layout = self.layout - op = layout.operator("image.invert", text="Invert Image Colors") - op.invert_r = True - op.invert_g = True - op.invert_b = True + props = layout.operator("image.invert", text="Invert Image Colors") + props.invert_r = True + props.invert_g = True + props.invert_b = True layout.separator() - op = layout.operator("image.invert", text="Invert Red Channel") - op.invert_r = True + props = layout.operator("image.invert", text="Invert Red Channel") + props.invert_r = True - op = layout.operator("image.invert", text="Invert Green Channel") - op.invert_g = True + props = layout.operator("image.invert", text="Invert Green Channel") + props.invert_g = True - op = layout.operator("image.invert", text="Invert Blue Channel") - op.invert_b = True + props = layout.operator("image.invert", text="Invert Blue Channel") + props.invert_b = True - op = layout.operator("image.invert", text="Invert Alpha Channel") - op.invert_a = True + props = layout.operator("image.invert", text="Invert Alpha Channel") + props.invert_a = True class IMAGE_MT_uvs_showhide(Menu): diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py index 2c537efa61b..5e5ce462da9 100644 --- a/release/scripts/startup/bl_ui/space_userpref_keymap.py +++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py @@ -164,11 +164,9 @@ class InputKeyMapPanel: row.label() if (not kmi.is_user_defined) and kmi.is_user_modified: - op = row.operator("wm.keyitem_restore", text="", icon='BACK') - op.item_id = kmi.id + row.operator("wm.keyitem_restore", text="", icon='BACK').item_id = kmi.id else: - op = row.operator("wm.keyitem_remove", text="", icon='X') - op.item_id = kmi.id + row.operator("wm.keyitem_remove", text="", icon='X').item_id = kmi.id # Expanded, additional event settings if kmi.show_expanded: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c6a26cd9bbf..1170bce2c14 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -54,11 +54,10 @@ class VIEW3D_HT_header(Header): else: sub.menu("VIEW3D_MT_object") - # Contains buttons like Mode, Pivot, Manipulator, Layer, Mesh Select Mode... - row = layout.row() #XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo + row = layout.row() # XXX Narrowed down vert/edge/face selector in edit mode/solid drawmode. -DingTo row.template_header_3D() - + if obj: # Particle edit if obj.mode == 'PARTICLE_EDIT': diff --git a/release/scripts/templates/driver_functions.py b/release/scripts/templates/driver_functions.py index db9d4fb4678..1c6af0e574f 100644 --- a/release/scripts/templates/driver_functions.py +++ b/release/scripts/templates/driver_functions.py @@ -16,6 +16,7 @@ def invert(f): uuid_store = {} + def slow_value(value, fac, uuid): """ Delay the value by a factor, use a unique string to allow use in multiple drivers without conflict: -- cgit v1.2.3