svn merge -r 22138:22364 https://svn.blender.org/svnroot/bf-blender/branches/blender...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 11 Aug 2009 12:55:50 +0000 (12:55 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Tue, 11 Aug 2009 12:55:50 +0000 (12:55 +0000)
1  2 
release/ui/buttons_scene.py
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c

@@@ -169,24 -161,18 +161,20 @@@ class SCENE_PT_performance(RenderButton
                col.itemR(rd, "parts_x", text="X")
                col.itemR(rd, "parts_y", text="Y")
  
-               split = layout.split()
                col = split.column()
                col.itemL(text="Memory:")
-               row = col.row()
-               row.itemR(rd, "save_buffers")
-               row.enabled = not rd.full_sample
-               col = split.column()
-               col.active = rd.use_compositing
-               col.itemL()
-               col.itemR(rd, "free_image_textures")
-               row = layout.row()
-               row.active = rd.render_raytracing
-               row.itemR(rd, "octree_resolution", text="Ray Tracing Octree")
-               row.itemR(rd, "raytrace_structure", text="Structure")
-               row.itemR(rd, "raytrace_tree_type", text="Tree Type")
+               sub = col.column()
+               sub.itemR(rd, "save_buffers")
+               sub.enabled = not rd.full_sample
+               sub = col.column()
+               sub.active = rd.use_compositing
+               sub.itemR(rd, "free_image_textures")
+               sub = col.column()
+               sub.active = rd.render_raytracing
+               sub.itemL(text="Ray Tracing Octree:")
+               sub.itemR(rd, "octree_resolution", text="")
++              sub.itemR(rd, "raytrace_structure", text="Structure")
++              sub.itemR(rd, "raytrace_tree_type", text="Tree Type")
  
  class SCENE_PT_post_processing(RenderButtonsPanel):
        __label__ = "Post Processing"