2.5 Buttons:

* Cleanup of scene, lamp and camera panels.

* Small RNA lamp changes.

1 files changed, 59 insertions, 52 deletions

diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 170c94cdef1..7644ad39f23 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -22,13 +22,13 @@ class RENDER_PT_shading(RenderButtonsPanel):
 		sub.itemR(rd, "render_sss", text="SSS")
 		sub.itemR(rd, "render_envmaps", text="EnvMap")
 		sub.itemR(rd, "render_radiosity", text="Radio")
+		sub.itemR(rd, "render_raytracing", text="Ray Tracing")
+		if (rd.render_raytracing):
+			sub.itemR(rd, "octree_resolution", text="Octree")
 		
 		sub = split.column()
-		subsub = sub.box()
-		subsub.itemR(rd, "render_raytracing", text="Ray Tracing")
-		if (rd.render_raytracing):
-			subsub.itemR(rd, "octree_resolution", text="Octree")
-		sub.itemR(rd, "alpha_mode")
+		sub.itemL(text="Alpha Mode:")
+		sub.itemR(rd, "alpha_mode", expand=True)
 		
 class RENDER_PT_image(RenderButtonsPanel):
 	__label__ = "Image"
@@ -38,12 +38,16 @@ class RENDER_PT_image(RenderButtonsPanel):
 		layout = self.layout
 
 		rd = scene.render_data
-
-		flow = layout.column_flow()
-		flow.itemR(rd, "resolution_x", text="SizeX")
-		flow.itemR(rd, "resolution_y", text="SizeY")
-		flow.itemR(rd, "pixel_aspect_x", text="AspX")
-		flow.itemR(rd, "pixel_aspect_y", text="AspY")
+		
+		split = layout.split()
+		
+		sub = split.column(align=True)
+		sub.itemR(rd, "resolution_x", text="SizeX")
+		sub.itemR(rd, "resolution_y", text="SizeY")
+		
+		sub = split.column(align=True)
+		sub.itemR(rd, "pixel_aspect_x", text="AspX")
+		sub.itemR(rd, "pixel_aspect_y", text="AspY")
 
 		box = layout.box()
 		box.itemR(rd, "output_path")
@@ -71,9 +75,9 @@ class RENDER_PT_antialiasing(RenderButtonsPanel):
 			row = layout.row()
 			row.itemL(text="Samples:")
 			row.itemR(rd, "antialiasing_samples", expand=True)
-			row = layout.row()
+			row = layout.row(align=True)
 			row.itemR(rd, "pixel_filter")
-			row.itemR(rd, "filter_size")
+			row.itemR(rd, "filter_size", text="Size")
 
 			row = layout.row()
 			row.itemR(rd, "save_buffers")
@@ -92,16 +96,20 @@ class RENDER_PT_render(RenderButtonsPanel):
 		row = layout.row()
 		row.itemO("SCREEN_OT_render", text="RENDER", icon=0) # ICON_SCENE
 		row.item_booleanO("SCREEN_OT_render", "anim", True, text="ANIM", icon=0)
-
-		row = layout.row()
-		row.itemR(scene, "start_frame", text="Start")
-		row.itemR(rd, "fps")
-		row.itemR(scene, "current_frame", text="Frame")
 		
-		row = layout.row()
-		row.itemR(scene, "end_frame", text="End")
-		row.itemR(rd, "fps_base",text="/")
-		row.itemR(scene, "frame_step", text="Step")
+		split = layout.split()
+		
+		sub = split.column(align=True)
+		sub.itemR(scene, "start_frame", text="Start")
+		sub.itemR(scene, "end_frame", text="End")
+		
+		sub = split.column(align=True)
+		sub.itemR(rd, "fps")
+		sub.itemR(rd, "fps_base",text="/")
+		
+		sub = split.column(align=True)
+		sub.itemR(scene, "current_frame", text="Frame")
+		sub.itemR(scene, "frame_step", text="Step")
 
 		row = layout.row()
 		row.itemR(rd, "do_composite")
@@ -109,47 +117,46 @@ class RENDER_PT_render(RenderButtonsPanel):
 
 		row = layout.row()
 		row.itemL(text="General:")
+		
+		split = layout.split()
+		
+		sub = split.column()
+		sub.itemR(rd, "resolution_percentage", text="Size")
 
-		flow = layout.column_flow()
-		flow.itemR(rd, "resolution_percentage", text="Size ")
-		flow.itemR(rd, "dither_intensity")
-		flow.itemR(rd, "parts_x")
-		flow.itemR(rd, "parts_y")
+		sub = split.column(align=True)
+		sub.itemR(rd, "parts_x")
+		sub.itemR(rd, "parts_y")
 		
 		split = layout.split()
 		
 		sub = split.column()
-		subsub = sub.box()
-		subsub.itemL(text="Threads Mode:")
-		subsub.itemR(rd, "threads_mode", expand=True)
+		sub.itemL(text="Threads Mode:")
+		sub.itemR(rd, "threads_mode", expand=True)
 		if rd.threads_mode == 'THREADS_FIXED':
-			subsub.itemR(rd, "threads")
-		
-		subsub = sub.box()
-		subsub.itemL(text="Distributed Rendering:")
-		subsub.itemR(rd, "placeholders")
-		subsub.itemR(rd, "no_overwrite")
-		subsub = sub.box()
-		subsub.itemR(rd, "fields", text="Fields")
+			sub.itemR(rd, "threads")
+		
+		sub.itemL(text="Distributed Rendering:")
+		sub.itemR(rd, "placeholders")
+		sub.itemR(rd, "no_overwrite")
+
+		sub.itemR(rd, "fields", text="Fields")
 		if rd.fields:
-			subsub.itemR(rd, "fields_still", text="Still")
-			subsub.itemR(rd, "field_order", text="Order")
+			sub.itemR(rd, "fields_still", text="Still")
+			sub.itemR(rd, "field_order", text="Order")
 		
 		sub = split.column()
-		subsub = sub.box()
-		subsub.itemL(text="Extra:")
-		subsub.itemR(rd, "panorama")
-		subsub.itemR(rd, "backbuf")
-		subsub.itemR(rd, "free_image_textures")
-		
-		subsub = sub.box()
-		subsub.itemL(text="Border:")
-		subsub.itemR(rd, "border", text="Border Render")
+		sub.itemL(text="Extra:")
+		sub.itemR(rd, "panorama")
+		sub.itemR(rd, "backbuf")
+		sub.itemR(rd, "free_image_textures")
+		sub.itemR(rd, "dither_intensity")
+		
+		sub.itemL(text="Border:")
+		sub.itemR(rd, "border", text="Border Render")
 		if rd.border:
-			subsub.itemR(rd, "crop_to_border")
+			sub.itemR(rd, "crop_to_border")
 
 bpy.types.register(RENDER_PT_render)
 bpy.types.register(RENDER_PT_antialiasing)
 bpy.types.register(RENDER_PT_shading)
-bpy.types.register(RENDER_PT_image)
-
+bpy.types.register(RENDER_PT_image)
\ No newline at end of file