[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31219] trunk/blender/release/scripts/ui: minor adjustments to python scripts to make them easier to run outside of blender .
Campbell Barton
ideasman42 at gmail.com
Tue Aug 10 20:21:33 CEST 2010
Revision: 31219
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31219
Author: campbellbarton
Date: 2010-08-10 20:21:33 +0200 (Tue, 10 Aug 2010)
Log Message:
-----------
minor adjustments to python scripts to make them easier to run outside of blender.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/properties_data_armature_rigify.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -95,12 +95,13 @@
subsubrow.operator("pose.metarig_assign", text="Assign")
subsubrow.operator("pose.metarig_clear", text="Clear")
- subsubrow = subrow.split(percentage=0.8)
- subsubrow.operator("pose.metarig_sample_add", text="Sample").metarig_type = self.templates[pose_templates.active_template_index]
- subsubrow.operator("pose.metarig_sample_add", text="All").metarig_type = "" # self.templates[pose_templates.active_template_index]
+ if self.templates:
+ subsubrow = subrow.split(percentage=0.8)
+ subsubrow.operator("pose.metarig_sample_add", text="Sample").metarig_type = self.templates[pose_templates.active_template_index]
+ subsubrow.operator("pose.metarig_sample_add", text="All").metarig_type = "" # self.templates[pose_templates.active_template_index]
- sub = row.column(align=True)
- sub.operator("pose.metarig_reload", icon="FILE_REFRESH", text="")
+ sub = row.column(align=True)
+ sub.operator("pose.metarig_reload", icon="FILE_REFRESH", text="")
# operators
Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/properties_material.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -24,7 +24,7 @@
def active_node_mat(mat):
# TODO, 2.4x has a pipeline section, for 2.5 we need to communicate
# which settings from node-materials are used
- if mat:
+ if mat is not None:
mat_node = mat.active_node_material
if mat_node:
return mat_node
Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/properties_object.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -252,7 +252,7 @@
col.prop(ob, "time_offset_edit", text="Edit")
row = col.row()
row.prop(ob, "time_offset_particle", text="Particle")
- row.active = len(ob.particle_systems) != 0
+ row.active = bool(ob.particle_systems)
row = col.row()
row.prop(ob, "time_offset_parent", text="Parent")
row.active = (ob.parent is not None)
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/properties_render.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -440,7 +440,7 @@
# Audio:
sub = layout.column()
- if rd.ffmpeg_format not in ('MP3'):
+ if rd.ffmpeg_format not in ('MP3', ):
sub.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
sub.separator()
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/space_info.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -27,7 +27,7 @@
layout = self.layout
wm = context.manager
- if wm and len(wm.operators):
+ if wm and wm.operators:
last_op = wm.operators[-1]
else:
last_op = None
@@ -131,7 +131,7 @@
bl_label = "Import"
def draw(self, context):
- if "collada_import" in dir(bpy.ops.wm):
+ if hasattr(bpy.types, "WM_OT_collada_import"):
self.layout.operator("wm.collada_import", text="COLLADA (.dae)")
@@ -140,7 +140,7 @@
bl_label = "Export"
def draw(self, context):
- if "collada_export" in dir(bpy.ops.wm):
+ if hasattr(bpy.types, "WM_OT_collada_export"):
self.layout.operator("wm.collada_export", text="COLLADA (.dae)")
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-08-10 15:46:16 UTC (rev 31218)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-08-10 18:21:33 UTC (rev 31219)
@@ -487,7 +487,7 @@
elif context.particle_edit_object:
return ts.particle_edit
- return False
+ return None
class VIEW3D_PT_tools_brush(PaintPanel, bpy.types.Panel):
@@ -753,7 +753,7 @@
col.separator()
col = layout.column()
- col.active = tex_slot.map_mode in ('FIXED')
+ col.active = tex_slot.map_mode in ('FIXED', )
col.label(text="Angle:")
col = layout.column()
@@ -963,6 +963,7 @@
layout = self.layout
settings = self.paint_settings(context)
+
brush = settings.brush
layout.template_curve_mapping(brush, "curve", brush=True)
More information about the Bf-blender-cvs
mailing list