[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24172] trunk/blender/release/scripts/ui: * Some Whitespace and small code-guideline cleanup.
Thomas Dinges
dingto at gmx.de
Fri Oct 30 00:46:12 CET 2009
Revision: 24172
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24172
Author: dingto
Date: 2009-10-30 00:46:12 +0100 (Fri, 30 Oct 2009)
Log Message:
-----------
* Some Whitespace and small code-guideline cleanup.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/buttons_data_bone.py
trunk/blender/release/scripts/ui/buttons_data_curve.py
trunk/blender/release/scripts/ui/buttons_material.py
trunk/blender/release/scripts/ui/buttons_particle.py
trunk/blender/release/scripts/ui/buttons_physics_field.py
trunk/blender/release/scripts/ui/space_filebrowser.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_sequencer.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
Modified: trunk/blender/release/scripts/ui/buttons_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_data_bone.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/buttons_data_bone.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -48,8 +48,6 @@
else:
pchan = ob.pose.pose_channels[context.bone.name]
-
-
row = layout.row()
col = row.column()
col.itemR(pchan, "location")
@@ -141,7 +139,6 @@
sub.itemR(bone, "hinge", text="Inherit Rotation")
sub.itemR(bone, "inherit_scale", text="Inherit Scale")
-
class BONE_PT_display(BoneButtonsPanel):
__label__ = "Display"
@@ -175,7 +172,6 @@
col.itemL(text="Custom Shape:")
col.itemR(pchan, "custom_shape", text="")
-
class BONE_PT_deform(BoneButtonsPanel):
__label__ = "Deform"
__default_closed__ = True
@@ -224,7 +220,6 @@
col.itemL(text="Offset:")
col.itemR(bone, "cyclic_offset")
-
bpy.types.register(BONE_PT_context_bone)
bpy.types.register(BONE_PT_transform)
bpy.types.register(BONE_PT_transform_locks)
Modified: trunk/blender/release/scripts/ui/buttons_data_curve.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_data_curve.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/buttons_data_curve.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -90,7 +90,6 @@
row.itemR(curve, "twist_mode")
row.itemR(curve, "twist_smooth") # XXX - may not be kept
-
# col.itemL(text="Display:")
# col.itemL(text="HANDLES")
# col.itemL(text="NORMALS")
@@ -219,7 +218,6 @@
col = split.column()
col.itemR(act_spline, "smooth")
-
bpy.types.register(DATA_PT_context_curve)
bpy.types.register(DATA_PT_shape_curve)
bpy.types.register(DATA_PT_geometry_curve)
Modified: trunk/blender/release/scripts/ui/buttons_material.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_material.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/buttons_material.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -13,7 +13,6 @@
return None
-
class MaterialButtonsPanel(bpy.types.Panel):
__space_type__ = 'PROPERTIES'
__region_type__ = 'WINDOW'
@@ -648,7 +647,6 @@
row.itemR(vol, "density")
row.itemR(vol, "density_scale")
-
class MATERIAL_PT_volume_shading(VolumeButtonsPanel):
__label__ = "Shading"
__default_closed__ = False
@@ -709,7 +707,6 @@
sub.itemR(vol, "ms_spread")
sub.itemR(vol, "ms_intensity")
-
class MATERIAL_PT_volume_transp(VolumeButtonsPanel):
__label__= "Transparency"
COMPAT_ENGINES = set(['BLENDER_RENDER'])
Modified: trunk/blender/release/scripts/ui/buttons_particle.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_particle.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/buttons_particle.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -14,7 +14,6 @@
if psys==None: return False
if psys.settings==None: return False
return psys.settings.type in ('EMITTER', 'REACTOR', 'HAIR')
-
class ParticleButtonsPanel(bpy.types.Panel):
__space_type__ = 'PROPERTIES'
@@ -32,6 +31,7 @@
def draw(self, context):
layout = self.layout
+
ob = context.object
psys = context.particle_system
@@ -46,6 +46,7 @@
if psys and not psys.settings:
split = layout.split(percentage=0.32)
+
col = split.column()
col.itemL(text="Name:")
col.itemL(text="Settings:")
@@ -458,8 +459,9 @@
return psys.settings.physics_type=='BOIDS'
def draw(self, context):
+ layout = self.layout
+
boids = context.particle_system.settings.boids
- layout = self.layout
layout.enabled = particle_panel_enabled(context, context.particle_system)
@@ -539,7 +541,6 @@
elif rule.type == 'FIGHT':
row.itemR(rule, "distance")
row.itemR(rule, "flee_distance")
-
class PARTICLE_PT_render(ParticleButtonsPanel):
__label__ = "Render"
@@ -623,7 +624,6 @@
subrow = row.row()
subrow.active = part.viewport==True
subrow.itemR(part, "simplify_viewport")
-
elif part.ren_as == 'OBJECT':
sub.itemR(part, "dupli_object")
@@ -659,7 +659,7 @@
if weight:
row = layout.row()
row.itemR(weight, "count")
-
+
elif part.ren_as == 'BILLBOARD':
sub.itemL(text="Align:")
@@ -853,6 +853,7 @@
def draw(self, context):
layout = self.layout
+
part = context.particle_system.settings
layout.itemR(part, "self_effect")
Modified: trunk/blender/release/scripts/ui/buttons_physics_field.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_physics_field.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/buttons_physics_field.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -64,6 +64,7 @@
flow.itemR(field, "guide_kink_frequency")
flow.itemR(field, "guide_kink_shape")
flow.itemR(field, "guide_kink_amplitude")
+
elif field.type == 'TEXTURE':
col = split.column()
col.itemR(field, "strength")
@@ -75,6 +76,7 @@
col.itemR(field, "use_coordinates")
col.itemR(field, "root_coordinates")
col.itemR(field, "force_2d")
+
else :
basic_force_field_settings_ui(self, field)
@@ -197,4 +199,4 @@
col.itemR(settings, "damping", text="Factor", slider=True)
bpy.types.register(PHYSICS_PT_field)
-bpy.types.register(PHYSICS_PT_collision)
\ No newline at end of file
+bpy.types.register(PHYSICS_PT_collision)
Modified: trunk/blender/release/scripts/ui/space_filebrowser.py
===================================================================
--- trunk/blender/release/scripts/ui/space_filebrowser.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_filebrowser.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -34,6 +34,8 @@
layout.itemR(params, "do_filter", text="", icon='ICON_FILTER')
row = layout.row(align=True)
+ row.active = params.do_filter
+
row.itemR(params, "filter_folder", text="");
row.itemR(params, "filter_blender", text="");
row.itemR(params, "filter_image", text="");
@@ -43,6 +45,4 @@
row.itemR(params, "filter_sound", text="");
row.itemR(params, "filter_text", text="");
- row.active = params.do_filter
-
bpy.types.register(FILEBROWSER_HT_header)
Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_info.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -82,7 +82,6 @@
layout.operator_context = "EXEC_AREA"
layout.itemO("wm.exit_blender", text="Quit", icon='ICON_QUIT')
-
# test for expanding menus
'''
class INFO_MT_file_more(INFO_MT_file):
@@ -124,7 +123,6 @@
layout.itemO("file.report_missing_files")
layout.itemO("file.find_missing_files")
-
class INFO_MT_mesh_add(dynamic_menu.DynMenu):
__label__ = "Mesh"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/ui/space_sequencer.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_sequencer.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -425,8 +425,7 @@
col.itemR(strip, "directory", text="")
# Current element for the filename
-
-
+
elem = strip.getStripElem(context.scene.current_frame)
if elem:
split = layout.split(percentage=0.2)
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -88,12 +88,7 @@
sub1.itemR(view, "auto_perspective")
sub1.itemR(view, "smooth_view")
sub1.itemR(view, "rotation_angle")
-
-
-
-
-
col = split.column()
sub = col.split(percentage=0.85)
sub1 = sub.column()
@@ -105,8 +100,6 @@
# sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
# sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
-
-
#manipulator
sub1.itemR(view, "use_manipulator")
sub2 = sub1.column()
@@ -164,8 +157,6 @@
sub1.itemR(edit, "undo_steps", text="Steps")
sub1.itemR(edit, "undo_memory_limit", text="Memory Limit")
-
-
col = split.column()
sub = col.split(percentage=0.85)
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -1464,8 +1464,6 @@
return ('RUNNING_MODAL',)
'''
-
-
bpy.types.register(VIEW3D_HT_header) # Header
bpy.types.register(VIEW3D_MT_view) #View Menus
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-10-29 22:37:43 UTC (rev 24171)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2009-10-29 23:46:12 UTC (rev 24172)
@@ -275,10 +275,7 @@
col = layout.column(align=True)
col.itemR(arm, "x_axis_mirror")
-
-
-
# ********** default tools for editmode_mball ****************
class VIEW3D_PT_tools_mballedit(View3DPanel):
More information about the Bf-blender-cvs
mailing list