[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25425] trunk/blender/release/scripts: pep8 corrections and no need to use C' s _OT_ syntax when accessing operator names from py
Campbell Barton
ideasman42 at gmail.com
Thu Dec 17 02:21:56 CET 2009
Revision: 25425
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25425
Author: campbellbarton
Date: 2009-12-17 02:21:55 +0100 (Thu, 17 Dec 2009)
Log Message:
-----------
pep8 corrections and no need to use C's _OT_ syntax when accessing operator names from py
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/op/uvcalc_follow_active.py
trunk/blender/release/scripts/ui/space_userpref.py
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2009-12-17 01:19:50 UTC (rev 25424)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2009-12-17 01:21:55 UTC (rev 25425)
@@ -258,7 +258,7 @@
'''
OTHER_INDEX = 2,3,0,1 # opposite face index
-
+
if faces is None:
faces= self.faces
@@ -270,13 +270,13 @@
edge_keys = f.edge_keys
for i, edkey in enumerate(f.edge_keys):
edges.setdefault(edkey, []).append(edge_keys[OTHER_INDEX[i]])
-
+
for edkey in seams:
edges[edkey] = []
-
+
# Collect edge loops here
- edge_loops = []
-
+ edge_loops = []
+
for edkey, ed_adj in edges.items():
if 0 <len(ed_adj) < 3: # 1 or 2
# Seek the first edge
@@ -286,22 +286,22 @@
other_dir = ed_adj[1]
else:
other_dir = None
-
+
ed_adj[:] = []
-
+
flipped = False
-
+
while 1:
# from knowing the last 2, look for th next.
ed_adj = edges[context_loop[-1]]
if len(ed_adj) != 2:
-
+
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[:] = []
context_loop.append(other_dir) # save 1 lookiup
-
+
ed_adj = edges[context_loop[-1]]
if len(ed_adj) != 2:
ed_adj[:] = []
@@ -309,14 +309,14 @@
else:
ed_adj[:] = []
break
-
+
i = ed_adj.index(context_loop[-2])
context_loop.append( ed_adj[ not i] )
-
+
# Dont look at this again
ed_adj[:] = []
-
+
return edge_loops
Modified: trunk/blender/release/scripts/op/screen_play_rendered_anim.py
===================================================================
--- trunk/blender/release/scripts/op/screen_play_rendered_anim.py 2009-12-17 01:19:50 UTC (rev 25424)
+++ trunk/blender/release/scripts/op/screen_play_rendered_anim.py 2009-12-17 01:21:55 UTC (rev 25425)
@@ -50,8 +50,8 @@
'THEORA':'ogg',
}
-movie_formats = ('QUICKTIME_QTKIT',
- 'QUICKTIME_CARBONTKIT',
+movie_formats = ('QUICKTIME_QTKIT',
+ 'QUICKTIME_CARBONTKIT',
'AVIRAW',
'AVIJPEG',
'AVICODEC',
@@ -62,30 +62,30 @@
def guess_player_path(preset):
if preset == 'BLENDER24':
player_path = 'blender'
-
+
if platform.system() == 'Darwin':
test_path = '/Applications/blender 2.49.app/Contents/MacOS/blender'
elif platform.system() == 'Windows':
test_path = '/Program Files/Blender Foundation/Blender/blender.exe'
-
+
if os.path.exists(test_path):
player_path = test_path
elif preset == 'DJV':
player_path = 'djv_view'
-
+
if platform.system() == 'Darwin':
test_path = '/Applications/djv-0.8.2.app/Contents/Resources/bin/djv_view'
if os.path.exists(test_path):
player_path = test_path
-
+
elif preset == 'FRAMECYCLER':
player_path = 'framecycler'
-
+
elif preset == 'RV':
player_path = 'rv'
-
-
+
+
return player_path
@@ -100,15 +100,15 @@
sce = context.scene
rd = sce.render_data
prefs = context.user_preferences
-
+
preset = prefs.filepaths.animation_player_preset
player_path = prefs.filepaths.animation_player
file_path = bpy.utils.expandpath(rd.output_path)
-
+
# try and guess a command line if it doesn't exist
if player_path == '':
player_path = guess_player_path(preset)
-
+
# doesn't support ### frame notation yet
if rd.file_format in movie_formats:
file = "%s%04d_%04d" % (file_path, sce.start_frame, sce.end_frame)
@@ -116,10 +116,10 @@
file = "%s%04d" % (file_path, sce.start_frame)
elif preset in ('FRAMECYCLER', 'RV'):
file = "%s#" % file_path
-
+
if rd.file_extensions:
file += '.' + img_format_exts[rd.file_format]
-
+
cmd = [player_path]
# extra options, fps controls etc.
if preset == 'BLENDER24':
@@ -146,4 +146,4 @@
return('FINISHED',)
-bpy.ops.add(PlayRenderedAnim)
\ No newline at end of file
+bpy.ops.add(PlayRenderedAnim)
Modified: trunk/blender/release/scripts/op/uvcalc_follow_active.py
===================================================================
--- trunk/blender/release/scripts/op/uvcalc_follow_active.py 2009-12-17 01:19:50 UTC (rev 25424)
+++ trunk/blender/release/scripts/op/uvcalc_follow_active.py 2009-12-17 01:21:55 UTC (rev 25425)
@@ -23,229 +23,241 @@
import bpy
+
def extend(obj, operator, EXTEND_MODE):
- me = obj.data
- me_verts = me.verts
- # script will fail without UVs
- if not me.active_uv_texture:
- me.add_uv_texture()
-
+ me = obj.data
+ me_verts = me.verts
+ # script will fail without UVs
+ if not me.active_uv_texture:
+ me.add_uv_texture()
- # Toggle Edit mode
- is_editmode = (obj.mode == 'EDIT')
- if is_editmode:
- bpy.ops.object.mode_set(mode='OBJECT')
- #t = sys.time()
- edge_average_lengths = {}
-
- OTHER_INDEX = 2,3,0,1
- FAST_INDICIES = 0,2,1,3 # order is faster
- def extend_uvs(face_source, face_target, edge_key):
- '''
- Takes 2 faces,
- Projects its extends its UV coords onto the face next to it.
- Both faces must share an edge.
- '''
-
- def face_edge_vs(vi):
- # assume a quad
- return [(vi[0], vi[1]), (vi[1], vi[2]), (vi[2], vi[3]), (vi[3], vi[0])]
-
- vidx_source = face_source.verts
- vidx_target = face_target.verts
+ # Toggle Edit mode
+ is_editmode = (obj.mode == 'EDIT')
+ if is_editmode:
+ bpy.ops.object.mode_set(mode='OBJECT')
- faceUVsource = me.active_uv_texture.data[face_source.index]
- uvs_source = [faceUVsource.uv1,faceUVsource.uv2,faceUVsource.uv3,faceUVsource.uv4]
+ #t = sys.time()
+ edge_average_lengths = {}
- faceUVtarget = me.active_uv_texture.data[face_target.index]
- uvs_target = [faceUVtarget.uv1,faceUVtarget.uv2,faceUVtarget.uv3,faceUVtarget.uv4]
+ OTHER_INDEX = 2, 3, 0, 1
+ FAST_INDICIES = 0, 2, 1, 3 # order is faster
- # vertex index is the key, uv is the value
+ def extend_uvs(face_source, face_target, edge_key):
+ '''
+ Takes 2 faces,
+ Projects its extends its UV coords onto the face next to it.
+ Both faces must share an edge.
+ '''
- uvs_vhash_source = dict( [ (vindex, uvs_source[i]) for i, vindex in enumerate(vidx_source)] )
+ def face_edge_vs(vi):
+ # assume a quad
+ return [(vi[0], vi[1]), (vi[1], vi[2]), (vi[2], vi[3]), (vi[3], vi[0])]
- uvs_vhash_target = dict( [ (vindex, uvs_target[i]) for i, vindex in enumerate(vidx_target)] )
-
- edge_idxs_source = face_edge_vs(vidx_source)
- edge_idxs_target = face_edge_vs(vidx_target)
-
- source_matching_edge = -1
- target_matching_edge = -1
-
- edge_key_swap = edge_key[1], edge_key[0]
-
- try: source_matching_edge = edge_idxs_source.index(edge_key)
- except: source_matching_edge = edge_idxs_source.index(edge_key_swap)
- try: target_matching_edge = edge_idxs_target.index(edge_key)
- except: target_matching_edge = edge_idxs_target.index(edge_key_swap)
-
+ vidx_source = face_source.verts
+ vidx_target = face_target.verts
-
- edgepair_inner_source = edge_idxs_source[source_matching_edge]
- edgepair_inner_target = edge_idxs_target[target_matching_edge]
- edgepair_outer_source = edge_idxs_source[OTHER_INDEX[source_matching_edge]]
- edgepair_outer_target = edge_idxs_target[OTHER_INDEX[target_matching_edge]]
-
- if edge_idxs_source[source_matching_edge] == edge_idxs_target[target_matching_edge]:
- iA= 0; iB= 1 # Flipped, most common
- else: # The normals of these faces must be different
- iA= 1; iB= 0
+ faceUVsource = me.active_uv_texture.data[face_source.index]
+ uvs_source = [faceUVsource.uv1, faceUVsource.uv2, faceUVsource.uv3, faceUVsource.uv4]
-
- # Set the target UV's touching source face, no tricky calc needed,
- uvs_vhash_target[edgepair_inner_target[0]][:] = uvs_vhash_source[edgepair_inner_source[iA]]
- uvs_vhash_target[edgepair_inner_target[1]][:] = uvs_vhash_source[edgepair_inner_source[iB]]
+ faceUVtarget = me.active_uv_texture.data[face_target.index]
+ uvs_target = [faceUVtarget.uv1, faceUVtarget.uv2, faceUVtarget.uv3, faceUVtarget.uv4]
+ # vertex index is the key, uv is the value
- # Set the 2 UV's on the target face that are not touching
- # for this we need to do basic expaning on the source faces UV's
- if EXTEND_MODE == 'LENGTH':
-
- try: # divide by zero is possible
- '''
- measure the length of each face from the middle of each edge to the opposite
- allong the axis we are copying, use this
- '''
- i1a= edgepair_outer_target[iB]
- i2a= edgepair_inner_target[iA]
- if i1a>i2a: i1a, i2a = i2a, i1a
-
- i1b= edgepair_outer_source[iB]
- i2b= edgepair_inner_source[iA]
- if i1b>i2b: i1b, i2b = i2b, i1b
- # print edge_average_lengths
- factor = edge_average_lengths[i1a, i2a][0] / edge_average_lengths[i1b, i2b][0]
- except:
- # Div By Zero?
- factor = 1.0
-
- uvs_vhash_target[edgepair_outer_target[iB]][:] = uvs_vhash_source[edgepair_inner_source[0]] +factor * (uvs_vhash_source[edgepair_inner_source[0]] - uvs_vhash_source[edgepair_outer_source[1]])
- uvs_vhash_target[edgepair_outer_target[iA]][:] = uvs_vhash_source[edgepair_inner_source[1]] +factor * (uvs_vhash_source[edgepair_inner_source[1]] - uvs_vhash_source[edgepair_outer_source[0]])
-
- else:
- # same as above but with no factor
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list