Revision: 20535
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20535
Author: dingto
Date: 2009-05-31 18:40:28 +0200 (Sun, 31 May 2009)
Log Message:
-----------
2.5 Buttons:
* Some world button tweaks by William Reynish. Thanks!
* Quality slider in scene buttons gets hidden again.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_scene.py
branches/blender2.5/blender/release/ui/buttons_world.py
Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-31
16:22:22 UTC (rev 20534)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-31
16:40:28 UTC (rev 20535)
@@ -45,9 +45,8 @@
col = split.column()
col.itemR(rd, "file_format", text="Format")
- colsub = col.column()
- colsub.active = rd.file_format in ("AVIJPEG", "JPEG")
- colsub.itemR(rd, "quality", slider=True)
+ if rd.file_format in ("AVIJPEG", "JPEG"):
+ col.itemR(rd, "quality", slider=True)
sub = split.column()
sub.itemR(rd, "color_mode")
Modified: branches/blender2.5/blender/release/ui/buttons_world.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_world.py 2009-05-31
16:22:22 UTC (rev 20534)
+++ branches/blender2.5/blender/release/ui/buttons_world.py 2009-05-31
16:40:28 UTC (rev 20535)
@@ -107,9 +107,15 @@
layout.itemR(ao, "gather_method", expand=True)
if ao.gather_method == 'RAYTRACE':
- row = layout.row()
- row.itemR(ao, "samples")
- row.itemR(ao, "distance")
+ split = layout.split()
+ col = split.column()
+ col.itemR(ao, "samples")
+ col.itemR(ao, "distance")
+ col = split.column()
+ col.itemR(ao, "falloff")
+ colsub = col.column()
+ colsub.active = ao.falloff
+ colsub.itemR(ao, "strength")
layout.itemR(ao, "sample_method")
if ao.sample_method == 'ADAPTIVE_QMC':
@@ -122,16 +128,18 @@
row.itemR(ao, "bias")
if ao.gather_method == 'APPROXIMATE':
- col = layout.column_flow()
+ split = layout.split()
+ col = split.column()
col.itemR(ao, "passes")
col.itemR(ao, "error_tolerance", text="Error")
col.itemR(ao, "correction")
+ col = split.column()
+ col.itemR(ao, "falloff")
+ colsub = col.column()
+ colsub.active = ao.falloff
+ colsub.itemR(ao, "strength")
col.itemR(ao, "pixel_cache")
- row = layout.row()
- row.itemR(ao, "falloff")
- row.itemR(ao, "strength")
-
col = layout.column()
col.row().itemR(ao, "blend_mode", expand=True)
col.row().itemR(ao, "color", expand=True)
@@ -142,5 +150,4 @@
bpy.types.register(WORLD_PT_ambient_occlusion)
bpy.types.register(WORLD_PT_mist)
bpy.types.register(WORLD_PT_stars)
-bpy.types.register(WORLD_PT_color_correction)
-
+bpy.types.register(WORLD_PT_color_correction)
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
