Revision: 23509
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23509
Author: dingto
Date: 2009-09-27 13:00:35 +0200 (Sun, 27 Sep 2009)
Log Message:
-----------
2.5 Layout Files:
* Some Code and Whitespace Cleanup.
Modified Paths:
--------------
trunk/blender/release/io/engine_render_pov.py
trunk/blender/release/io/netrender/ui.py
trunk/blender/release/ui/buttons_data_armature.py
trunk/blender/release/ui/buttons_data_bone.py
trunk/blender/release/ui/buttons_data_camera.py
trunk/blender/release/ui/buttons_data_curve.py
trunk/blender/release/ui/buttons_data_lamp.py
trunk/blender/release/ui/buttons_data_lattice.py
trunk/blender/release/ui/buttons_data_mesh.py
trunk/blender/release/ui/buttons_data_metaball.py
trunk/blender/release/ui/buttons_data_text.py
trunk/blender/release/ui/buttons_game.py
trunk/blender/release/ui/buttons_material.py
trunk/blender/release/ui/buttons_object_constraint.py
trunk/blender/release/ui/buttons_physics_cloth.py
trunk/blender/release/ui/buttons_physics_field.py
trunk/blender/release/ui/buttons_physics_fluid.py
trunk/blender/release/ui/buttons_physics_smoke.py
trunk/blender/release/ui/buttons_physics_softbody.py
trunk/blender/release/ui/buttons_scene.py
trunk/blender/release/ui/buttons_texture.py
trunk/blender/release/ui/buttons_world.py
trunk/blender/release/ui/space_sequencer.py
trunk/blender/release/ui/space_view3d_toolbar.py
trunk/blender/source/blender/editors/space_node/drawnode.c
Modified: trunk/blender/release/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/io/engine_render_pov.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/io/engine_render_pov.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -110,8 +110,7 @@
file.write('\tdiffuse 0.8\n')
file.write('\tspecular 0.2\n')
-
-
+
# This is written into the object
'''
if material and material.transparency_method=='RAYTRACE':
@@ -143,9 +142,7 @@
file.write('\trotate <%.6f, %.6f, %.6f>\n' % tuple([degrees(e)
for e in matrix.rotationPart().toEuler()]))
file.write('\ttranslate <%.6f, %.6f, %.6f>\n' % (matrix[3][0],
matrix[3][1], matrix[3][2]))
file.write('}\n')
-
-
-
+
def exportLamps(lamps):
# Get all lamps
for ob in lamps:
@@ -186,9 +183,7 @@
else:
size_y = lamp.size_y
samples_y = lamp.shadow_ray_samples_y
-
-
-
+
file.write('\tarea_light <%d,0,0>,<0,0,%d> %d,
%d\n' % (size_x, size_y, samples_x, samples_y))
if lamp.shadow_ray_sampling_method ==
'CONSTANT_JITTERED':
if lamp.jitter:
@@ -264,10 +259,7 @@
writeMatrix(ob.matrix)
file.write('}\n')
-
-
-
-
+
def exportMeshs(sel):
ob_num = 0
@@ -475,8 +467,7 @@
file.write(',\n\t\t<%d,%d,%d>,
%d,%d,%d' % (fv[i1], fv[i2], fv[i3], ci1, ci2, ci3)) # vert count
-
-
+
file.write('\n }\n')
# normal_indices indicies
@@ -589,7 +580,6 @@
file.close()
-
def write_pov_ini(filename_ini, filename_pov, filename_image):
scene = bpy.data.scenes[0]
render = scene.render_data
@@ -775,9 +765,7 @@
# compute resolution
x= int(r.resolution_x*r.resolution_percentage*0.01)
y= int(r.resolution_y*r.resolution_percentage*0.01)
-
-
-
+
# Wait for the file to be created
while not os.path.exists(self.temp_file_out):
if self.test_break():
@@ -876,12 +864,13 @@
COMPAT_ENGINES = set(['POVRAY_RENDER'])
def draw_header(self, context):
- layout = self.layout
scene = context.scene
- layout.itemR(scene, "pov_radio_enable", text="")
+ self.layout.itemR(scene, "pov_radio_enable", text="")
+
def draw(self, context):
layout = self.layout
+
scene = context.scene
rd = scene.render_data
@@ -890,7 +879,6 @@
split = layout.split()
col = split.column()
-
col.itemR(scene, "pov_radio_count", text="Rays")
col.itemR(scene, "pov_radio_recursion_limit", text="Recursions")
col = split.column()
@@ -905,15 +893,12 @@
col.itemR(scene, "pov_radio_adc_bailout", slider=True)
col.itemR(scene, "pov_radio_gray_threshold",
slider=True)
col.itemR(scene, "pov_radio_low_error_factor",
slider=True)
-
-
-
+
col = split.column()
col.itemR(scene, "pov_radio_brightness")
col.itemR(scene, "pov_radio_minimum_reuse", text="Min
Reuse")
col.itemR(scene, "pov_radio_nearest_count")
-
-
+
split = layout.split()
col = split.column()
@@ -923,6 +908,5 @@
col = split.column()
col.itemR(scene, "pov_radio_always_sample")
-
bpy.types.register(SCENE_PT_povray_radiosity)
Modified: trunk/blender/release/io/netrender/ui.py
===================================================================
--- trunk/blender/release/io/netrender/ui.py 2009-09-27 09:38:13 UTC (rev
23508)
+++ trunk/blender/release/io/netrender/ui.py 2009-09-27 11:00:35 UTC (rev
23509)
@@ -39,6 +39,7 @@
def draw(self, context):
layout = self.layout
+
scene = context.scene
rd = scene.render_data
@@ -69,6 +70,7 @@
def draw(self, context):
layout = self.layout
+
scene = context.scene
rd = scene.render_data
Modified: trunk/blender/release/ui/buttons_data_armature.py
===================================================================
--- trunk/blender/release/ui/buttons_data_armature.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_armature.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.armature)
+ return context.armature
class DATA_PT_context_arm(DataButtonsPanel):
__show_header__ = False
@@ -128,7 +128,6 @@
split = layout.split()
col = split.column()
-
sub = col.column(align=True)
if (arm.paths_type == 'CURRENT_FRAME'):
sub.itemR(arm, "path_before_current", text="Before")
Modified: trunk/blender/release/ui/buttons_data_bone.py
===================================================================
--- trunk/blender/release/ui/buttons_data_bone.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_bone.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -240,7 +240,6 @@
#row = split.row()
#row.itemR(pchan, "ik_lin_weight", text="Weight",
slider=True)
#row.active = pchan.ik_lin_control
-
class BONE_PT_deform(BoneButtonsPanel):
__label__ = "Deform"
@@ -307,6 +306,7 @@
def draw(self, context):
layout = self.layout
+
ob = context.object
itasc = ob.pose.ik_param
Modified: trunk/blender/release/ui/buttons_data_camera.py
===================================================================
--- trunk/blender/release/ui/buttons_data_camera.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_camera.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.camera)
+ return context.camera
class DATA_PT_context_camera(DataButtonsPanel):
__show_header__ = False
@@ -92,8 +92,7 @@
sub = col.column()
sub.active = cam.show_passepartout
sub.itemR(cam, "passepartout_alpha", text="Alpha", slider=True)
-
-
+
bpy.types.register(DATA_PT_context_camera)
bpy.types.register(DATA_PT_camera)
bpy.types.register(DATA_PT_camera_display)
Modified: trunk/blender/release/ui/buttons_data_curve.py
===================================================================
--- trunk/blender/release/ui/buttons_data_curve.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_curve.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -120,7 +120,6 @@
col.itemL(text="Bevel Object:")
col.itemR(curve, "bevel_object", text="")
-
class DATA_PT_pathanim(DataButtonsPanelCurve):
__label__ = "Path Animation"
Modified: trunk/blender/release/ui/buttons_data_lamp.py
===================================================================
--- trunk/blender/release/ui/buttons_data_lamp.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_lamp.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.lamp)
+ return context.lamp
class DATA_PT_preview(DataButtonsPanel):
__label__ = "Preview"
@@ -87,8 +87,7 @@
lamp = context.lamp.sky
layout.itemR(lamp, "sky")
-
-
+
row = layout.row()
row.active = lamp.sky or lamp.atmosphere
row.itemR(lamp, "atmosphere_turbidity", text="Turbidity")
@@ -198,7 +197,7 @@
sub.itemR(lamp, "dither")
sub.itemR(lamp, "jitter")
- if lamp.shadow_method == 'BUFFER_SHADOW':
+ elif lamp.shadow_method == 'BUFFER_SHADOW':
col = layout.column()
col.itemL(text="Buffer Type:")
col.row().itemR(lamp, "shadow_buffer_type", expand=True)
@@ -258,8 +257,6 @@
elif (lamp.shape == 'RECTANGLE'):
sub.itemR(lamp, "size", text="Size X")
sub.itemR(lamp, "size_y", text="Size Y")
-
- col = split.column()
class DATA_PT_spot(DataButtonsPanel):
__label__ = "Spot Shape"
Modified: trunk/blender/release/ui/buttons_data_lattice.py
===================================================================
--- trunk/blender/release/ui/buttons_data_lattice.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_lattice.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.lattice)
+ return context.lattice
class DATA_PT_context_lattice(DataButtonsPanel):
__show_header__ = False
Modified: trunk/blender/release/ui/buttons_data_mesh.py
===================================================================
--- trunk/blender/release/ui/buttons_data_mesh.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_mesh.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -7,7 +7,7 @@
__context__ = "data"
def poll(self, context):
- return (context.mesh)
+ return context.mesh
class DATA_PT_context_mesh(DataButtonsPanel):
__show_header__ = False
Modified: trunk/blender/release/ui/buttons_data_metaball.py
===================================================================
--- trunk/blender/release/ui/buttons_data_metaball.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_metaball.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -6,7 +6,7 @@
__context__ = "data"
def poll(self, context):
- return (context.meta_ball)
+ return context.meta_ball
class DATA_PT_context_metaball(DataButtonsPanel):
__show_header__ = False
@@ -74,11 +74,9 @@
col.itemR(metaelem, "hide", text="Hide")
if metaelem.type == 'BALL':
-
col = split.column(align=True)
elif metaelem.type == 'CUBE':
-
col = split.column(align=True)
col.itemL(text="Size:")
col.itemR(metaelem, "size_x", text="X")
@@ -86,26 +84,22 @@
col.itemR(metaelem, "size_z", text="Z")
elif metaelem.type == 'TUBE':
-
col = split.column(align=True)
col.itemL(text="Size:")
col.itemR(metaelem, "size_x", text="X")
elif metaelem.type == 'PLANE':
-
col = split.column(align=True)
col.itemL(text="Size:")
col.itemR(metaelem, "size_x", text="X")
col.itemR(metaelem, "size_y", text="Y")
elif metaelem.type == 'ELLIPSOID':
-
col = split.column(align=True)
col.itemL(text="Size:")
col.itemR(metaelem, "size_x", text="X")
col.itemR(metaelem, "size_y", text="Y")
col.itemR(metaelem, "size_z", text="Z")
-
bpy.types.register(DATA_PT_context_metaball)
bpy.types.register(DATA_PT_metaball)
Modified: trunk/blender/release/ui/buttons_data_text.py
===================================================================
--- trunk/blender/release/ui/buttons_data_text.py 2009-09-27 09:38:13 UTC
(rev 23508)
+++ trunk/blender/release/ui/buttons_data_text.py 2009-09-27 11:00:35 UTC
(rev 23509)
@@ -125,7 +125,6 @@
col.itemL(text="Underline:")
col.itemR(text, "ul_position", text="Position")
col.itemR(text, "ul_height", text="Thickness")
-
class DATA_PT_paragraph(DataButtonsPanel):
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
