[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25566] trunk/blender: pep8 edits, removed MakeCursor.py and rna_array.py, not important to make pep8
Campbell Barton
ideasman42 at gmail.com
Sat Dec 26 10:36:50 CET 2009
Revision: 25566
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25566
Author: campbellbarton
Date: 2009-12-26 10:36:50 +0100 (Sat, 26 Dec 2009)
Log Message:
-----------
pep8 edits, removed MakeCursor.py and rna_array.py, not important to make pep8
Modified Paths:
--------------
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/io/export_ply.py
trunk/blender/release/scripts/modules/bpy/__init__.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/rigify/leg_quadruped_generic.py
trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/release/scripts/op/add_armature_human.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/release/test/rna_array.py
trunk/blender/source/tools/MakeCursor.py
Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/io/export_fbx.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -3361,7 +3361,7 @@
# to the class instance from the operator settings before calling.
- path = StringProperty(name="File Path", description="File path used for exporting the FBX file", maxlen= 1024, default= "")
+ path = StringProperty(name="File Path", description="File path used for exporting the FBX file", maxlen= 1024, default="")
EXP_OBS_SELECTED = BoolProperty(name="Selected Objects", description="Export selected objects on visible layers", default=True)
# EXP_OBS_SCENE = BoolProperty(name="Scene Objects", description="Export all objects in this scene", default=True)
@@ -3387,7 +3387,7 @@
BATCH_ENABLE = BoolProperty(name="Enable Batch", description="Automate exporting multiple scenes or groups to files", default=False)
BATCH_GROUP = BoolProperty(name="Group > File", description="Export each group as an FBX file, if false, export each scene as an FBX file", default=False)
BATCH_OWN_DIR = BoolProperty(name="Own Dir", description="Create a dir for each exported file", default=True)
- BATCH_FILE_PREFIX = StringProperty(name="Prefix", description="Prefix each file with this name", maxlen= 1024, default="")
+ BATCH_FILE_PREFIX = StringProperty(name="Prefix", description="Prefix each file with this name", maxlen=1024, default="")
def poll(self, context):
@@ -3467,4 +3467,3 @@
self.layout.operator(ExportFBX.bl_idname, text="Autodesk FBX...").path = default_path
menu_item = bpy.types.INFO_MT_file_export.append(menu_func)
-
Modified: trunk/blender/release/scripts/io/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/io/export_mdd.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/io/export_mdd.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -96,7 +96,7 @@
numverts = len(me.verts)
- numframes = PREF_ENDFRAME-PREF_STARTFRAME + 1
+ numframes = PREF_ENDFRAME - PREF_STARTFRAME + 1
PREF_FPS = float(PREF_FPS)
f = open(filename, 'wb') #no Errors yet:Safe to create file
@@ -104,7 +104,7 @@
f.write(pack(">2i", numframes, numverts))
# Write the frame times (should we use the time IPO??)
- f.write( pack(">%df" % (numframes), *[frame / PREF_FPS for frame in range(numframes)]) ) # seconds
+ f.write(pack(">%df" % (numframes), *[frame / PREF_FPS for frame in range(numframes)])) # seconds
#rest frame needed to keep frames in sync
"""
@@ -159,8 +159,8 @@
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
- path = StringProperty(name="File Path", description="File path used for exporting the MDD file", maxlen= 1024, default= "")
- fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default= 25)
+ path = StringProperty(name="File Path", description="File path used for exporting the MDD file", maxlen=1024)
+ fps = IntProperty(name="Frames Per Second", description="Number of frames/second", min=minfps, max=maxfps, default=25)
start_frame = IntProperty(name="Start Frame", description="Start frame for baking", min=minframe, max=maxframe, default=1)
end_frame = IntProperty(name="End Frame", description="End frame for baking", min=minframe, max=maxframe, default=250)
@@ -182,7 +182,7 @@
bpy.types.register(ExportMDD)
-# Add to a menu
+
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".mdd")
self.layout.operator(ExportMDD.bl_idname, text="Vertex Keyframe Animation (.mdd)...").path = default_path
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/io/export_ply.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -180,7 +180,7 @@
normal_key = rvec3d(normal)
if faceUV:
- uvcoord = uv[j][0], 1.0-uv[j][1]
+ uvcoord = uv[j][0], 1.0 - uv[j][1]
uvcoord_key = rvec2d(uvcoord)
elif vertexUV:
uvcoord = v.uvco[0], 1.0 - v.uvco[1]
@@ -246,7 +246,7 @@
file.write('\n')
for pf in ply_faces:
- if len(pf)==3:
+ if len(pf) == 3:
file.write('3 %d %d %d\n' % tuple(pf))
else:
file.write('4 %d %d %d %d\n' % tuple(pf))
@@ -318,6 +318,7 @@
bpy.types.register(ExportPLY)
+
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".ply")
self.layout.operator(ExportPLY.bl_idname, text="Stanford (.ply)...").path = default_path
Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -85,7 +85,6 @@
# a bit nasty but this prevents help() and input() from locking blender
# Ideally we could have some way for the console to replace sys.stdin but
# python would lock blender while waiting for a return value, not easy :|
- import sys
sys.stdin = None
# if "-d" in sys.argv: # Enable this to measure startup speed
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -265,10 +265,10 @@
optionaly, seams are edge keys that will be removed
"""
- OTHER_INDEX = 2,3,0,1 # opposite face index
+ OTHER_INDEX = 2, 3, 0, 1 # opposite face index
if faces is None:
- faces= self.faces
+ faces = self.faces
edges = {}
@@ -286,7 +286,7 @@
edge_loops = []
for edkey, ed_adj in edges.items():
- if 0 <len(ed_adj) < 3: # 1 or 2
+ if 0 < len(ed_adj) < 3: # 1 or 2
# Seek the first edge
context_loop = [edkey, ed_adj[0]]
edge_loops.append(context_loop)
@@ -304,7 +304,7 @@
ed_adj = edges[context_loop[-1]]
if len(ed_adj) != 2:
- if other_dir and flipped==False: # the original edge had 2 other edges
+ if other_dir and flipped == False: # the original edge had 2 other edges
flipped = True # only flip the list once
context_loop.reverse()
ed_adj[:] = []
@@ -319,7 +319,7 @@
break
i = ed_adj.index(context_loop[-2])
- context_loop.append( ed_adj[ not i] )
+ context_loop.append(ed_adj[not i])
# Dont look at this again
ed_adj[:] = []
@@ -379,21 +379,22 @@
class Menu(StructRNA):
__slots__ = ()
-
+
@classmethod
def _dyn_menu_initialize(cls):
draw_funcs = getattr(cls.draw, "_draw_funcs", None)
if draw_funcs is None:
+
def draw_ls(*args):
for func in draw_ls._draw_funcs:
func(*args)
-
+
draw_funcs = draw_ls._draw_funcs = [cls.draw]
cls.draw = draw_ls
-
+
return draw_funcs
-
+
@classmethod
def append(cls, draw_func):
"""Prepend an draw function to this menu, takes the same arguments as the menus draw function."""
@@ -436,4 +437,3 @@
"""
import bpy
self.path_menu(bpy.utils.preset_paths(self.preset_subdir), self.preset_operator)
-
Modified: trunk/blender/release/scripts/modules/rigify/leg_quadruped_generic.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/leg_quadruped_generic.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/modules/rigify/leg_quadruped_generic.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -19,9 +19,8 @@
# <pep8 compliant>
import bpy
-from rigify import RigifyError, get_layer_dict
-from rigify_utils import bone_class_instance, copy_bone_simple, blend_bone_list, get_side_name, get_base_name, add_pole_target_bone
-from rna_prop_ui import rna_idprop_ui_prop_get
+from rigify import RigifyError
+from rigify_utils import bone_class_instance, copy_bone_simple, add_pole_target_bone
from Mathutils import Vector
METARIG_NAMES = "hips", "thigh", "shin", "foot", "toe"
Modified: trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/modules/rigify/spine_pivot_flex.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -90,6 +90,7 @@
pbone = obj.pose.bones['rib_cage']
pbone['type'] = 'spine_pivot_flex'
+
def metarig_definition(obj, orig_bone_name):
'''
The bone given is the second in a chain.
Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py 2009-12-26 09:00:53 UTC (rev 25565)
+++ trunk/blender/release/scripts/modules/rna_info.py 2009-12-26 09:36:50 UTC (rev 25566)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
# classes for extracting info from blenders internal classes
import bpy
@@ -23,22 +25,28 @@
# use to strip python paths
script_paths = bpy.utils.script_paths()
+
def range_str(val):
- if val < -10000000: return '-inf'
- if val > 10000000: return 'inf'
- if type(val)==float:
- return '%g' % val
+ if val < -10000000:
+ return '-inf'
+ elif val > 10000000:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list