svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2...

[blender-staging.git] / release / ui / buttons_scene.py

diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index 12200eb26ca104bbe44b9be6f87b5b681f26bd36..6dcec8d2efeb501f312a39f535017e84e48500f7 100644 (file)
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -173,6 +173,8 @@ class SCENE_PT_performance(RenderButtonsPanel):
                sub.active = rd.render_raytracing
                sub.itemL(text="Ray Tracing Octree:")
                sub.itemR(rd, "octree_resolution", text="")
                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"
 
 class SCENE_PT_post_processing(RenderButtonsPanel):
        __label__ = "Post Processing"