merged changes to revision 24446
[blender.git] / release / scripts / ui / properties_render.py
index a2ad2b239c1eb111532dc2eb9e0ee6eec23b1d4e..ddc0b552634040615239f79ab77d752735495d0e 100644 (file)
@@ -96,12 +96,12 @@ class RENDER_PT_layers(RenderButtonsPanel):
         col.itemR(rl, "solid")
         col.itemR(rl, "halo")
         col.itemR(rl, "ztransp")
-               col.itemR(rl, "sky")
+        col.itemR(rl, "sky")
                
         col = split.column()
         col.itemR(rl, "edge")
         col.itemR(rl, "strand")
-               col.itemR(rl, "freestyle")
+        col.itemR(rl, "freestyle")
 
         if rl.zmask:
             split = layout.split()
@@ -142,32 +142,32 @@ class RENDER_PT_layers(RenderButtonsPanel):
         row.itemR(rl, "pass_refraction")
         row.itemR(rl, "pass_refraction_exclude", text="", icon='ICON_X')
 
-               if rl.freestyle:
-                       layout.itemS()
+        if rl.freestyle:
+            layout.itemS()
 
-                       split = layout.split()
-
-                       col = split.column()
-                       col.itemL(text="Freestyle:")
-                       freestyle = rl.freestyle_settings
-                       col.itemR(freestyle, "sphere_radius", text="Sphere Radius")
-                       col.itemR(freestyle, "ridges_and_valleys", text="Ridges and Valleys")
-                       col.itemR(freestyle, "suggestive_contours", text="Suggestive Contours")
-                       col.itemR(freestyle, "dkr_epsilon", text="Dkr Epsilon")
-
-                       col.itemO("scene.freestyle_module_add", text="Add Style Module")
+            split = layout.split()
 
-                       for i, module in enumerate(freestyle.modules):
-                               box = layout.box()
-                               box.set_context_pointer("freestyle_module", module)
-                               row = box.row(align=True)
-                               row.itemR(module, "is_displayed", text="")
-                               row.itemR(module, "module_path", text="")
-                               row.itemO("scene.freestyle_module_remove", icon='ICON_X', text="")
-                               props = row.itemO("scene.freestyle_module_move_up", icon='VICON_MOVE_UP', text="", properties=True)
-                               props.active = (i > 0)
-                               props = row.itemO("scene.freestyle_module_move_down", icon='VICON_MOVE_DOWN', text="", properties=True)
-                               props.active = (i < len(freestyle.modules) - 1)
+            col = split.column()
+            col.itemL(text="Freestyle:")
+            freestyle = rl.freestyle_settings
+            col.itemR(freestyle, "sphere_radius", text="Sphere Radius")
+            col.itemR(freestyle, "ridges_and_valleys", text="Ridges and Valleys")
+            col.itemR(freestyle, "suggestive_contours", text="Suggestive Contours")
+            col.itemR(freestyle, "dkr_epsilon", text="Dkr Epsilon")
+
+            col.itemO("scene.freestyle_module_add", text="Add Style Module")
+
+            for i, module in enumerate(freestyle.modules):
+                    box = layout.box()
+                    box.set_context_pointer("freestyle_module", module)
+                    row = box.row(align=True)
+                    row.itemR(module, "is_displayed", text="")
+                    row.itemR(module, "module_path", text="")
+                    row.itemO("scene.freestyle_module_remove", icon='ICON_X', text="")
+                    props = row.itemO("scene.freestyle_module_move_up", icon='VICON_MOVE_UP', text="", properties=True)
+                    props.active = (i > 0)
+                    props = row.itemO("scene.freestyle_module_move_down", icon='VICON_MOVE_DOWN', text="", properties=True)
+                    props.active = (i < len(freestyle.modules) - 1)
 
 
 class RENDER_PT_shading(RenderButtonsPanel):
@@ -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")
@@ -271,11 +271,11 @@ class RENDER_PT_post_processing(RenderButtonsPanel):
         sub.itemR(rd, "edge_threshold", text="Threshold", slider=True)
         sub.itemR(rd, "edge_color", text="")
 
-               layout.itemS()
+        layout.itemS()
 
-               split = layout.split()
-               col = split.column()
-               col.itemR(rd, "freestyle", text="Freestyle")
+        split = layout.split()
+        col = split.column()
+        col.itemR(rd, "freestyle", text="Freestyle")
 
 
 class RENDER_PT_output(RenderButtonsPanel):