[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34889] trunk/blender: bugfix [#26094] Going to Bone Roll menu brings up python error
Campbell Barton
ideasman42 at gmail.com
Wed Feb 16 03:25:04 CET 2011
Revision: 34889
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34889
Author: campbellbarton
Date: 2011-02-16 02:25:03 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
bugfix [#26094] Going to Bone Roll menu brings up python error
also correct for pep8 warnings.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/doc/python_api/examples/bpy.data.py
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/release/scripts/op/fcurve_euler_filter.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/panel_simple.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/release/scripts/ui/properties_physics_common.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/space_nla.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/tests/batch_import.py
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -62,11 +62,6 @@
# extension checking
-def is_c_header(filename):
- ext = splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
-
-
def is_cmake(filename):
ext = splitext(filename)[1]
return (ext == ".cmake") or (filename == "CMakeLists.txt")
Modified: trunk/blender/doc/python_api/examples/bpy.data.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.data.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/doc/python_api/examples/bpy.data.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -25,5 +25,3 @@
file.write("%s %dx%d\n" % (image.filepath, image.size[0], image.size[1]))
file.close()
-
-
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -423,7 +423,7 @@
if len(type_map) > len(unique):
raise Exception("Some types are not used: %s" % str([member for member in type_map if member not in unique]))
else:
- pass # will have raised an error above
+ pass # will have raised an error above
def rna2sphinx(BASEPATH):
Modified: trunk/blender/release/scripts/op/fcurve_euler_filter.py
===================================================================
--- trunk/blender/release/scripts/op/fcurve_euler_filter.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/op/fcurve_euler_filter.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -78,6 +78,7 @@
main(context)
return {'FINISHED'}
+
def register():
bpy.utils.register_module(__name__)
Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/op/wm.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -387,6 +387,7 @@
class WM_MT_context_menu_enum(bpy.types.Menu):
bl_label = ""
data_path = "" # BAD DESIGN, set from operator below.
+
def draw(self, context):
data_path = self.data_path
value = context_path_validate(bpy.context, data_path)
@@ -394,7 +395,7 @@
return {'PASS_THROUGH'}
base_path, prop_string = data_path.rsplit(".", 1)
value_base = context_path_validate(context, base_path)
-
+
values = [(i.name, i.identifier) for i in value_base.bl_rna.properties[prop_string].items]
for name, identifier in values:
@@ -408,7 +409,7 @@
bl_label = "Context Enum Menu"
bl_options = {'UNDO'}
data_path = rna_path_prop
-
+
def execute(self, context):
data_path = self.data_path
WM_MT_context_menu_enum.data_path = data_path
Modified: trunk/blender/release/scripts/templates/panel_simple.py
===================================================================
--- trunk/blender/release/scripts/templates/panel_simple.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/templates/panel_simple.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -26,7 +26,7 @@
def unregister():
- bpy.utils.unregister_class(OBJECT_PT_hello)
+ bpy.utils.unregister_class(OBJECT_PT_hello)
if __name__ == "__main__":
Modified: trunk/blender/release/scripts/ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_armature.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/properties_data_armature.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -157,20 +157,20 @@
class DATA_PT_pose_library(ArmatureButtonsPanel, bpy.types.Panel):
bl_label = "Pose Library"
bl_options = {'DEFAULT_CLOSED'}
-
+
@classmethod
def poll(cls, context):
return (context.object and context.object.type == 'ARMATURE' and context.object.pose)
-
+
def draw(self, context):
layout = self.layout
-
+
ob = context.object
poselib = ob.pose_library
-
+
row = layout.row()
row.template_ID(ob, "pose_library", new="poselib.new", unlink="poselib.unlink")
-
+
if poselib:
activePoseIndex = poselib.pose_markers.active_index
if len(poselib.pose_markers):
@@ -179,23 +179,23 @@
else:
activePose = None
activePoseName = None
-
+
row = layout.row()
row.template_list(poselib, "pose_markers", poselib.pose_markers, "active_index", rows=5)
-
+
col = row.column(align=True)
col.active = (poselib.library is None)
-
- # invoke should still be used for 'add', as it is needed to allow
+
+ # invoke should still be used for 'add', as it is needed to allow
# add/replace options to be used properly
col.operator("poselib.pose_add", icon='ZOOMIN', text="")
-
- col.operator_context = 'EXEC_DEFAULT' # exec not invoke, so that menu doesn't need showing
+
+ col.operator_context = 'EXEC_DEFAULT' # exec not invoke, so that menu doesn't need showing
col.operator("poselib.pose_remove", icon='ZOOMOUT', text="").pose = activePoseName
-
+
#col.operator_context = 'EXEC_DEFAULT' # exec not invoke, so modal preview loop doesn't run
col.operator("poselib.browse_interactive", icon='ZOOM_SELECTED', text="").pose_index = activePoseIndex
-
+
# TODO: "validate action" operator to be restored
Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -383,7 +383,7 @@
col.prop(md, "use_mirror_v", text="V")
col = layout.column()
-
+
if md.use_mirror_merge == True:
col.prop(md, "merge_threshold")
col.label(text="Mirror Object:")
Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/properties_particle.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -823,7 +823,7 @@
elif part.render_type == 'BILLBOARD':
ob = context.object
-
+
sub.label(text="Align:")
row = layout.row()
@@ -850,7 +850,7 @@
col = layout.column()
col.active = part.billboard_uv_split > 1
col.prop_search(psys, "billboard_split_uv", ob.data, "uv_textures")
-
+
row = col.row()
row.label(text="Animate:")
row.prop(part, "billboard_animation", text="")
Modified: trunk/blender/release/scripts/ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_common.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/properties_physics_common.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -274,7 +274,7 @@
sub = row.row()
sub.active = field.use_min_distance
sub.prop(field, "distance_min", text="Minimum")
-
+
col = split.column()
row = col.row(align=True)
row.prop(field, "use_max_distance", text="")
Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/properties_texture.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -62,10 +62,10 @@
idblock = context.brush
if idblock:
return idblock
-
+
if context.particle_system:
idblock = context.particle_system.settings
-
+
return idblock
@@ -991,7 +991,7 @@
factor_but(col, "use_map_zenith_down", "zenith_down_factor", "Zenith Down")
elif isinstance(idblock, bpy.types.ParticleSettings):
split = layout.split()
-
+
col = split.column()
col.label(text="General:")
factor_but(col, "use_map_time", "time_factor", "Time")
@@ -1005,21 +1005,21 @@
factor_but(col, "use_map_damp", "damp_factor", "Damp")
factor_but(col, "use_map_gravity", "gravity_factor", "Gravity")
factor_but(col, "use_map_field", "field_factor", "Force Fields")
-
+
layout.label(text="Hair:")
-
+
split = layout.split()
-
+
col = split.column()
factor_but(col, "use_map_length", "length_factor", "Length")
factor_but(col, "use_map_clump", "clump_factor", "Clump")
-
+
col = split.column()
factor_but(col, "use_map_kink", "kink_factor", "Kink")
factor_but(col, "use_map_rough", "rough_factor", "Rough")
layout.separator()
-
+
if not isinstance(idblock, bpy.types.ParticleSettings):
split = layout.split()
Modified: trunk/blender/release/scripts/ui/space_nla.py
===================================================================
--- trunk/blender/release/scripts/ui/space_nla.py 2011-02-16 02:10:26 UTC (rev 34888)
+++ trunk/blender/release/scripts/ui/space_nla.py 2011-02-16 02:25:03 UTC (rev 34889)
@@ -98,7 +98,6 @@
layout.operator("nla.select_leftright", text="After Current Frame").mode = 'RIGHT'
-
class NLA_MT_marker(bpy.types.Menu):
bl_label = "Marker"
Modified: trunk/blender/release/scripts/ui/space_userpref.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list