[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35548] trunk/blender: pep8 edits and remove commented code from last commit.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 15 00:17:53 CET 2011
Revision: 35548
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35548
Author: campbellbarton
Date: 2011-03-14 23:17:52 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
pep8 edits and remove commented code from last commit.
Modified Paths:
--------------
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/io_utils.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_particle.py
trunk/blender/release/scripts/ui/space_userpref.py
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -78,7 +78,7 @@
def is_project_file(filename):
- return (is_c_any(filename) or is_cmake(filename)) # and is_svn_file(filename)
+ return (is_c_any(filename) or is_cmake(filename)) # and is_svn_file(filename)
def cmake_advanced_info():
@@ -185,7 +185,6 @@
includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
includes.sort()
-
PROJECT_NAME = "Blender"
f = open(join(base, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel))
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -28,6 +28,7 @@
bpy_types.BlendDataLibraries.load = _bpy._library_load
+
class Context(StructRNA):
__slots__ = ()
Modified: trunk/blender/release/scripts/modules/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/io_utils.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/modules/io_utils.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -25,7 +25,7 @@
class ExportHelper:
filepath = StringProperty(name="File Path", description="Filepath used for exporting the file", maxlen=1024, default="", subtype='FILE_PATH')
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
-
+
# subclasses can override with decorator
# True == use ext, False == no ext, None == do nothing.
check_extension = True
@@ -46,7 +46,7 @@
def check(self, context):
check_extension = self.check_extension
-
+
if check_extension is None:
return False
Modified: trunk/blender/release/scripts/op/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/op/vertexpaint_dirt.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/op/vertexpaint_dirt.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -30,6 +30,7 @@
# but results are far more accurate
#
+
def applyVertexDirt(me, blur_iterations, blur_strength, clamp_dirt, clamp_clean, dirt_only):
from mathutils import Vector
from math import acos
Modified: trunk/blender/release/scripts/ui/properties_material.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_material.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/ui/properties_material.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -624,7 +624,6 @@
row.prop(phys, "friction")
row.prop(phys, "elasticity", slider=True)
-
row = layout.row()
row.label(text="Force Field:")
@@ -775,7 +774,6 @@
col.prop(mat, "use_cast_approximate")
-
class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel):
bl_label = "Transparency"
bl_options = {'DEFAULT_CLOSED'}
Modified: trunk/blender/release/scripts/ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object_constraint.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/ui/properties_object_constraint.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -556,44 +556,44 @@
elif con.pivot_type == 'GENERIC_6_DOF':
layout.label(text="Limits:")
split = layout.split()
-
+
col = split.column(align=True)
col.prop(con, "use_limit_x", text="X")
sub = col.column()
sub.active = con.use_limit_x
sub.prop(con, "limit_min_x", text="Min")
sub.prop(con, "limit_max_x", text="Max")
-
+
col = split.column(align=True)
col.prop(con, "use_limit_y", text="Y")
sub = col.column()
sub.active = con.use_limit_y
sub.prop(con, "limit_min_y", text="Min")
sub.prop(con, "limit_max_y", text="Max")
-
+
col = split.column(align=True)
col.prop(con, "use_limit_z", text="Z")
sub = col.column()
sub.active = con.use_limit_z
sub.prop(con, "limit_min_z", text="Min")
sub.prop(con, "limit_max_z", text="Max")
-
+
split = layout.split()
-
+
col = split.column(align=True)
col.prop(con, "use_angular_limit_x", text="Angle X")
sub = col.column()
sub.active = con.use_angular_limit_x
sub.prop(con, "limit_angle_min_x", text="Min")
sub.prop(con, "limit_angle_max_x", text="Max")
-
+
col = split.column(align=True)
col.prop(con, "use_angular_limit_y", text="Angle Y")
sub = col.column()
sub.active = con.use_angular_limit_y
sub.prop(con, "limit_angle_min_y", text="Min")
sub.prop(con, "limit_angle_max_y", text="Max")
-
+
col = split.column(align=True)
col.prop(con, "use_angular_limit_z", text="Angle Z")
sub = col.column()
@@ -790,4 +790,3 @@
if __name__ == "__main__":
register()
-
Modified: trunk/blender/release/scripts/ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_particle.py 2011-03-14 23:02:47 UTC (rev 35547)
+++ trunk/blender/release/scripts/ui/properties_particle.py 2011-03-14 23:17:52 UTC (rev 35548)
@@ -407,7 +407,7 @@
row = layout.row()
row.label(text="Initial Rotation:")
row.prop(part, "use_dynamic_rotation")
-
+
split = layout.split()
col = split.column(align=True)
@@ -417,7 +417,7 @@
col = split.column(align=True)
col.prop(part, "phase_factor", slider=True)
col.prop(part, "phase_factor_random", text="Random", slider=True)
-
+
col = layout.column()
col.label(text="Angular Velocity:")
col.row().prop(part, "angular_velocity_mode", expand=True)
@@ -464,53 +464,53 @@
if part.physics_type in ('NEWTON', 'FLUID'):
split = layout.split()
-
+
col = split.column()
col.label(text="Forces:")
col.prop(part, "brownian_factor")
col.prop(part, "drag_factor", slider=True)
col.prop(part, "damping", slider=True)
-
+
col = split.column()
col.label(text="Integration:")
col.prop(part, "integrator", text="")
col.prop(part, "time_tweak")
col.prop(part, "subframes")
-
+
row = layout.row()
row.prop(part, "use_size_deflect")
row.prop(part, "use_die_on_collision")
-
+
if part.physics_type == 'FLUID':
fluid = part.fluid
-
+
split = layout.split()
-
+
col = split.column()
col.label(text="Fluid properties:")
col.prop(fluid, "stiffness", text="Stiffness")
col.prop(fluid, "linear_viscosity", text="Viscosity")
col.prop(fluid, "buoyancy", text="Buoancy", slider=True)
-
+
col = split.column()
col.label(text="Advanced:")
sub = col.row()
sub.prop(fluid, "repulsion", slider=fluid.factor_repulsion)
sub.prop(fluid, "factor_repulsion", text="")
-
+
sub = col.row()
sub.prop(fluid, "stiff_viscosity", slider=fluid.factor_stiff_viscosity)
sub.prop(fluid, "factor_stiff_viscosity", text="")
-
+
sub = col.row()
sub.prop(fluid, "fluid_radius", slider=fluid.factor_radius)
sub.prop(fluid, "factor_radius", text="")
-
+
sub = col.row()
sub.prop(fluid, "rest_density", slider=fluid.factor_density)
sub.prop(fluid, "factor_density", text="")
-
+
split = layout.split()
col = split.column()
@@ -521,7 +521,7 @@
sub.active = fluid.use_viscoelastic_springs
sub.prop(fluid, "yield_ratio", slider=True)
sub.prop(fluid, "plasticity", slider=True)
-
+
col = split.column()
col.label(text="Advanced:")
sub = col.row()
@@ -532,7 +532,6 @@
sub.active = fluid.use_viscoelastic_springs
sub.prop(fluid, "use_initial_rest_length")
sub.prop(fluid, "spring_frames", text="Frames")
-
elif part.physics_type == 'KEYED':
split = layout.split()
@@ -772,7 +771,7 @@
col = split.column()
col.prop(part, "use_render_emitter")
col.prop(part, "use_parent_particles")
-
+
col = split.column()
col.prop(part, "show_unborn")
col.prop(part, "use_dead")
@@ -786,7 +785,7 @@
if part.render_type == 'LINE':
col.prop(part, "line_length_tail")
col.prop(part, "line_length_head")
-
+
split.prop(part, "use_velocity_length")
elif part.render_type == 'PATH':
col.prop(part, "use_strand_primitive")
@@ -831,7 +830,7 @@
elif part.render_type == 'GROUP':
col.prop(part, "dupli_group")
split = layout.split()
-
+
col = split.column()
col.prop(part, "use_whole_group")
sub = col.column()
@@ -915,6 +914,7 @@
row.prop(part, "particle_size")
row.prop(part, "size_random", slider=True)
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list