From b96aa8800edd4edee1a8fa5eca51c9d7f51419b4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 Jul 2013 04:34:39 +0000 Subject: bump up openmp limit for release, also remove 'Vertex ' prefix for items in the vertex menu. --- release/scripts/startup/bl_ui/space_view3d.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'release') 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() -- cgit v1.2.3 From ffaebe2237d4cdc84dc196cbbf60e1a96b0af3e4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 Jul 2013 01:20:32 +0000 Subject: reduce imports on startup --- release/scripts/modules/addon_utils.py | 2 +- release/scripts/startup/bl_operators/wm.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'release') 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) -- cgit v1.2.3 From d07f060206353627b52b0fe3e22c9a8889d48149 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 3 Jul 2013 12:22:46 +0000 Subject: Fix #35974: smoke flow force field icon missing in add menu. --- release/datafiles/blender_icons.svg | 235 +++++++++++++++++++++++++++++++++- release/datafiles/blender_icons16.png | Bin 239745 -> 240951 bytes release/datafiles/blender_icons32.png | Bin 602125 -> 605550 bytes 3 files changed, 234 insertions(+), 1 deletion(-) (limited to 'release') diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index ef742839da0..4d2a75adb44 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -14,7 +14,7 @@ height="640" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.48.2 r9819" version="1.0" sodipodi:docname="blender_icons.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" @@ -26927,6 +26927,129 @@ x2="80.53125" y2="502" gradientUnits="userSpaceOnUse" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Wed, 3 Jul 2013 15:57:30 +0000 Subject: Weight Paint: Enable Transfer Weights tool for Obejcts with no Vertex Groups --- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 444002a0702..535011f184f 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1126,7 +1126,10 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel, Panel): col.operator("object.vertex_group_clean", text="Clean") col.operator("object.vertex_group_levels", text="Levels") col.operator("object.vertex_group_blend", text="Blend") + col = layout.column() col.operator("object.vertex_group_transfer_weight", text="Transfer Weights") + col = layout.column() + col.active = ob.vertex_groups.active is not None col.operator("object.vertex_group_limit_total", text="Limit Total") col.operator("object.vertex_group_fix", text="Fix Deforms") col.operator("paint.weight_gradient") -- cgit v1.2.3 From 75aed60ed846acd994121de1d6c47ffb00a5b6c8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 Jul 2013 21:07:41 +0000 Subject: remove checks for active object in the weight panel, this is incorrect for weight transfer and we better rely on operators poll functions. --- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 535011f184f..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") @@ -1126,10 +1123,7 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel, Panel): col.operator("object.vertex_group_clean", text="Clean") col.operator("object.vertex_group_levels", text="Levels") col.operator("object.vertex_group_blend", text="Blend") - col = layout.column() col.operator("object.vertex_group_transfer_weight", text="Transfer Weights") - col = layout.column() - col.active = ob.vertex_groups.active is not None col.operator("object.vertex_group_limit_total", text="Limit Total") col.operator("object.vertex_group_fix", text="Fix Deforms") col.operator("paint.weight_gradient") -- cgit v1.2.3