diff options
author | Thomas Dinges <blender@dingto.org> | 2013-07-04 02:12:42 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-07-04 02:12:42 +0400 |
commit | e7fc69bdfd06f9fda7ddbcf53f26fee0b81abf8d (patch) | |
tree | 1b2c2ed06269d15be21188e828b7310ee7488730 /release/scripts | |
parent | 3a6e382d4aef6ad4bcba8a482d6d5fb5f96a6618 (diff) | |
parent | 374383997cc2dc36819eb0ec125d6a2d06809f71 (diff) |
Merged revision(s) 57908-57978 from trunk/blender into soc-2013-dingto.
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/addon_utils.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index a197c20fdab..3aa4eef6392 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -369,7 +369,6 @@ def reset_all(reload_scripts=False): Sets the addon state based on the user preferences. """ import sys - import imp # RELEASE SCRIPTS: official scripts distributed in Blender releases paths_list = paths() @@ -381,6 +380,7 @@ def reset_all(reload_scripts=False): # first check if reload is needed before changing state. if reload_scripts: + import imp mod = sys.modules.get(mod_name) if mod: imp.reload(mod) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 5cb7a44267a..3919ecdd72f 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -27,8 +27,6 @@ from bpy.props import (StringProperty, EnumProperty, ) -from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear - from bpy.app.translations import pgettext_tip as tip_ @@ -1029,6 +1027,8 @@ class WM_OT_properties_edit(Operator): ) def execute(self, context): + from rna_prop_ui import rna_idprop_ui_prop_get, rna_idprop_ui_prop_clear + data_path = self.data_path value = self.value prop = self.property @@ -1080,6 +1080,8 @@ class WM_OT_properties_edit(Operator): return {'FINISHED'} def invoke(self, context, event): + from rna_prop_ui import rna_idprop_ui_prop_get + data_path = self.data_path if not data_path: @@ -1109,6 +1111,8 @@ class WM_OT_properties_add(Operator): data_path = rna_path def execute(self, context): + from rna_prop_ui import rna_idprop_ui_prop_get + data_path = self.data_path item = eval("context.%s" % data_path) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0eea75e4e64..20f998cd568 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1938,8 +1938,8 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.operator("mesh.rip_move_fill") layout.operator("mesh.split") layout.operator_menu_enum("mesh.separate", "type") - layout.operator("mesh.vert_connect") - layout.operator("transform.vert_slide") + layout.operator("mesh.vert_connect", text="Connect") + layout.operator("transform.vert_slide", text="Slide") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 444002a0702..1383775042d 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1115,10 +1115,7 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel, Panel): def draw(self, context): layout = self.layout - ob = context.active_object - col = layout.column() - col.active = ob.vertex_groups.active is not None col.operator("object.vertex_group_normalize_all", text="Normalize All") col.operator("object.vertex_group_normalize", text="Normalize") col.operator("object.vertex_group_mirror", text="Mirror") |