[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43049] trunk/blender: pep8 edits
Campbell Barton
ideasman42 at gmail.com
Sun Jan 1 09:53:00 CET 2012
Revision: 43049
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43049
Author: campbellbarton
Date: 2012-01-01 08:52:54 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
pep8 edits
Modified Paths:
--------------
trunk/blender/intern/tools/dump_rna2xml.py
trunk/blender/release/scripts/modules/animsys_refactor.py
trunk/blender/release/scripts/modules/sys_info.py
trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
Modified: trunk/blender/intern/tools/dump_rna2xml.py
===================================================================
--- trunk/blender/intern/tools/dump_rna2xml.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/intern/tools/dump_rna2xml.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -32,6 +32,7 @@
import bpy
import rna_xml
+
def main():
filename = os.path.splitext(bpy.data.filepath)[0] + ".xml"
@@ -47,7 +48,6 @@
rna_xml.rna2xml(file.write,
root_rna=bpy.context.user_preferences.themes[0],
method='ATTR')
-
file.close()
Modified: trunk/blender/release/scripts/modules/animsys_refactor.py
===================================================================
--- trunk/blender/release/scripts/modules/animsys_refactor.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/modules/animsys_refactor.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -38,6 +38,7 @@
""" Dummy class used to parse fcurve and driver data paths.
"""
__slots__ = ("data_path", )
+
def __init__(self, attrs):
self.data_path = attrs
Modified: trunk/blender/release/scripts/modules/sys_info.py
===================================================================
--- trunk/blender/release/scripts/modules/sys_info.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/modules/sys_info.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -99,7 +99,7 @@
ffmpeg = bpy.app.ffmpeg
if ffmpeg.supported:
for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
- output.write('{}:{}{}\n'.format(lib, " "*(10-len(lib)),
+ output.write('{}:{}{}\n'.format(lib, " " * (10 - len(lib)),
getattr(ffmpeg, lib + '_version_string')))
else:
output.write('Blender was built without FFmpeg support\n')
Modified: trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -49,7 +49,7 @@
rotation_mode = obj.rotation_mode
if rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
obj.rotation_mode = 'XYZ'
-
+
if delta:
obj.delta_rotation_euler[0] += vec[0]
obj.delta_rotation_euler[1] += vec[1]
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -32,6 +32,7 @@
import subprocess
import os
+
class MESH_OT_delete_edgeloop(Operator):
'''Delete an edge loop by merging the faces on each side to a single face loop'''
bl_idname = "mesh.delete_edgeloop"
@@ -1176,27 +1177,29 @@
return {'CANCELLED'}
+
class WM_OT_blenderplayer_start(bpy.types.Operator):
'''Launch the Blenderplayer with the current blendfile'''
bl_idname = "wm.blenderplayer_start"
bl_label = "Start"
-
+
blender_bin_path = bpy.app.binary_path
blender_bin_dir = os.path.dirname(blender_bin_path)
ext = os.path.splitext(blender_bin_path)[-1]
player_path = os.path.join(blender_bin_dir, "blenderplayer" + ext)
-
+
def execute(self, context):
import sys
if sys.platform == "darwin":
self.player_path = os.path.join(self.blender_bin_dir, "../../../blenderplayer.app/Contents/MacOS/blenderplayer")
-
+
filepath = bpy.app.tempdir + "game.blend"
bpy.ops.wm.save_as_mainfile(filepath=filepath, check_existing=False, copy=True)
subprocess.call([self.player_path, filepath])
return {'FINISHED'}
+
class WM_OT_keyconfig_test(Operator):
"Test keyconfig for conflicts"
bl_idname = "wm.keyconfig_test"
@@ -1462,6 +1465,7 @@
self.report({'INFO'}, "See OperatorList.txt textblock")
return {'FINISHED'}
+
# -----------------------------------------------------------------------------
# Addon Operators
@@ -1809,7 +1813,7 @@
def execute(self, context):
import rna_xml
-
+
filepath = self.filepath
file = open(filepath, 'w', encoding='utf-8')
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -247,6 +247,7 @@
class RENDER_PT_embedded(RenderButtonsPanel, bpy.types.Panel):
bl_label = "Embedded Player"
COMPAT_ENGINES = {'BLENDER_GAME'}
+
def draw(self, context):
layout = self.layout
@@ -270,17 +271,17 @@
layout = self.layout
gs = context.scene.game_settings
-
+
row = layout.row()
row.operator("wm.blenderplayer_start", text="Start")
row.prop(gs, "show_fullscreen")
-
+
row = layout.row()
row.label(text="Resolution:")
row = layout.row(align=True)
row.prop(gs, "resolution_x", slider=False, text="X")
row.prop(gs, "resolution_y", slider=False, text="Y")
-
+
col = layout.column()
col.label(text="Quality:")
col = layout.column(align=True)
@@ -288,7 +289,6 @@
col.prop(gs, "frequency", text="Refresh Rate", slider=False)
-
class RENDER_PT_game_stereo(RenderButtonsPanel, Panel):
bl_label = "Stereo"
COMPAT_ENGINES = {'BLENDER_GAME'}
@@ -476,6 +476,7 @@
row.prop(rd, "sample_dist")
row.prop(rd, "sample_max_error")
+
class RENDER_PT_game_sound(RenderButtonsPanel, Panel):
bl_label = "Sound"
COMPAT_ENGINES = {'BLENDER_GAME'}
@@ -491,6 +492,7 @@
col.prop(scene, "audio_doppler_speed", text="Speed")
col.prop(scene, "audio_doppler_factor")
+
class WorldButtonsPanel():
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -85,7 +85,7 @@
def draw(self, context):
layout = self.layout
-
+
if context.scene.render.engine == "BLENDER_GAME":
layout.label("Not available in the Game Engine")
return
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-01-01 08:12:51 UTC (rev 43048)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2012-01-01 08:52:54 UTC (rev 43049)
@@ -2248,7 +2248,7 @@
col.prop(mesh, "show_extra_face_angle")
col.prop(mesh, "show_extra_face_area")
if bpy.app.debug:
- col.prop(mesh, "show_extra_indices")
+ col.prop(mesh, "show_extra_indices")
class VIEW3D_PT_view3d_curvedisplay(Panel):
More information about the Bf-blender-cvs
mailing list