svn merge -r 22138:22364 https://svn.blender.org/svnroot/bf-blender/branches/blender...
[blender.git] / release / ui / buttons_scene.py
index 2ab19b591369f8a68af593561f2f815e896a2558..4410b16e6029205746793b4043a22f7249f5ba2b 100644 (file)
@@ -1,12 +1,6 @@
 
 import bpy
 
-# If python version is less than 2.4, try to get set stuff from module
-try:
-       set
-except:
-       from sets import Set as set
-
 class RenderButtonsPanel(bpy.types.Panel):
        __space_type__ = "BUTTONS_WINDOW"
        __region_type__ = "WINDOW"
@@ -163,30 +157,24 @@ class SCENE_PT_performance(RenderButtonsPanel):
                sub = col.column()
                sub.enabled = rd.threads_mode == 'THREADS_FIXED'
                sub.itemR(rd, "threads")
-
-               col = split.column(align=True)
                col.itemL(text="Tiles:")
                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"