merged changes to revision 24446

2009-11-10 12:08:02 +00:00
parent 51efe7de27 14f9e686fa
commit 10bf807574
254 changed files with 20440 additions and 14387 deletions
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -227,7 +227,7 @@ class RENDER_PT_performance(RenderButtonsPanel):
        sub.active = rd.render_raytracing
        sub.itemL(text="Acceleration structure:")
        sub.itemR(rd, "raytrace_structure", text="")
-        if rd.raytrace_structure == "OCTREE":
+        if rd.raytrace_structure == 'OCTREE':
            sub.itemR(rd, "octree_resolution", text="Resolution")
        else:
            sub.itemR(rd, "use_instances", text="Instances")