From a5c60e3405e38a4646eb4256e8e2817366f2dad1 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 31 May 2009 16:40:28 +0000 Subject: [PATCH] 2.5 Buttons: * Some world button tweaks by William Reynish. Thanks! * Quality slider in scene buttons gets hidden again. --- release/ui/buttons_scene.py | 5 ++--- release/ui/buttons_world.py | 27 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 2d0aaff6f46..561e5b94e3e 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -45,9 +45,8 @@ class RENDER_PT_output(RenderButtonsPanel): 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") diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py index c38e791d92a..f12a76bfb66 100644 --- a/release/ui/buttons_world.py +++ b/release/ui/buttons_world.py @@ -107,9 +107,15 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel): 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 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel): 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_world) 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