[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37703] trunk/blender: pep8 compliance
Campbell Barton
ideasman42 at gmail.com
Tue Jun 21 19:17:52 CEST 2011
Revision: 37703
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37703
Author: campbellbarton
Date: 2011-06-21 17:17:51 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
pep8 compliance
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/build_files/cmake/cmake_consistency_check.py
trunk/blender/doc/python_api/examples/bpy.props.4.py
trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
trunk/blender/release/scripts/startup/bl_operators/nla.py
trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/tools/CTS/FBlender.py
Modified: trunk/blender/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/build_files/buildbot/master.cfg 2011-06-21 17:17:51 UTC (rev 37703)
@@ -74,6 +74,7 @@
else:
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
Modified: trunk/blender/build_files/buildbot/master_unpack.py
===================================================================
--- trunk/blender/build_files/buildbot/master_unpack.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -64,10 +64,11 @@
return '-'.join(platform_tokens)
+
def get_branch(filename):
tokens = filename.split("-")
branch = ""
-
+
for token in tokens:
if branch == "":
branch = token
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -36,7 +36,7 @@
branch = ''
if len(sys.argv) >= 3:
- branch = sys.argv[2]
+ branch = sys.argv[2]
# scons does own packaging
if builder.find('scons') != -1:
Modified: trunk/blender/build_files/cmake/cmake_consistency_check.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/build_files/cmake/cmake_consistency_check.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -32,7 +32,7 @@
"/decimation/intern/future/",
"/TerraplayNetwork/",
"/ik_glut_test/",
-
+
# specific source files
"extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp",
"extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp",
@@ -65,10 +65,7 @@
"extern/eltopo/common/meshes/meshloader.h",
"extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
)
-
-
-
import os
from os.path import join, dirname, normpath, abspath, splitext
Modified: trunk/blender/doc/python_api/examples/bpy.props.4.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.props.4.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/doc/python_api/examples/bpy.props.4.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -10,6 +10,7 @@
import bpy
+
def update_func(self, context):
print("my test function", self)
Modified: trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -22,6 +22,7 @@
"load_image",
)
+
# limited replacement for BPyImage.comprehensiveImageLoad
def load_image(imagepath,
dirname="",
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -27,6 +27,7 @@
"ngon_tesselate",
)
+
def mesh_linked_faces(mesh):
"""
Splits the mesh into connected faces, use this for seperating cubes from
Modified: trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -25,6 +25,7 @@
"location_3d_to_region_2d",
)
+
def region_2d_to_vector_3d(region, rv3d, coord):
"""
Return a direction vector from the viewport at the spesific 2d region
@@ -48,7 +49,7 @@
out = Vector(((2.0 * coord[0] / region.width) - 1.0,
(2.0 * coord[1] / region.height) - 1.0,
-0.5
- ))
+ ))
w = (out[0] * persinv[0][3]) + \
(out[1] * persinv[1][3]) + \
Modified: trunk/blender/release/scripts/startup/bl_operators/nla.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/nla.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_operators/nla.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -103,7 +103,7 @@
# -------------------------------------------------------------------------
# Collect transformations
-
+
# could speed this up by applying steps here too...
for f in frame_range:
scene.frame_set(f)
Modified: trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -244,6 +244,7 @@
self.frame_end = self.frame_start + self.frame_duration
return self.execute(context)
+
def obj_bb_minmax(obj, min_co, max_co):
for i in range(0, 8):
bb_vec = Vector(obj.bound_box[i]) * obj.matrix_world
Modified: trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
-# <pep8 compliant>
+# TODO <pep8 compliant>
from mathutils import Matrix, Vector, geometry
import bpy
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -112,22 +112,23 @@
sub.prop(curve, "use_fill_front")
sub.prop(curve, "use_fill_back")
col.prop(curve, "use_fill_deform", text="Fill Deformed")
-
+
+
class DATA_PT_curve_texture_space(CurveButtonsPanel, bpy.types.Panel):
bl_label = "Texture Space"
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
+
def draw(self, context):
layout = self.layout
-
+
ob = context.object
curve = context.curve
row = layout.row()
row.prop(curve, "use_auto_texspace")
row.prop(curve, "use_uv_as_generated")
-
+
row = layout.row()
row.column().prop(curve, "texspace_location", text="Location")
row.column().prop(curve, "texspace_size", text="Size")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -118,6 +118,7 @@
row.column().prop(mesh, "texspace_location", text="Location")
row.column().prop(mesh, "texspace_size", text="Size")
+
class DATA_PT_vertex_groups(MeshButtonsPanel, bpy.types.Panel):
bl_label = "Vertex Groups"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -70,20 +70,20 @@
layout.label(text="Update:")
layout.prop(mball, "update_method", expand=True)
-
-
+
+
class DATA_PT_mball_texture_space(DataButtonsPanel, bpy.types.Panel):
bl_label = "Texture Space"
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
+
def draw(self, context):
layout = self.layout
mball = context.meta_ball
layout.prop(mball, "use_auto_texspace")
-
+
row = layout.row()
row.column().prop(mball, "texspace_location", text="Location")
row.column().prop(mball, "texspace_size", text="Size")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-06-21 17:04:48 UTC (rev 37702)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-06-21 17:17:51 UTC (rev 37703)
@@ -485,7 +485,7 @@
if md.wrap_method == 'PROJECT':
split = layout.split(percentage=0.25)
-
+
col = split.column()
col.label(text="Axis:")
col.prop(md, "use_project_x")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-06-21 17:04:48 UTC (rev 37702)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list