Merged revision(s) 57908-57978 from trunk/blender into soc-2013-dingto.

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)

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)
 

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()
 

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")