merged changes to revision 24446

[blender.git] / release / scripts / ui / properties_render.py

diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py
index 0524b00f011923d0f9951306f99e6e329d8f413c..ddc0b552634040615239f79ab77d752735495d0e 100644 (file)
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -4,12 +4,12 @@
 #  modify it under the terms of the GNU General Public License
 #  as published by the Free Software Foundation; either version 2
 #  of the License, or (at your option) any later version.
-# 
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -96,11 +96,12 @@ class RENDER_PT_layers(RenderButtonsPanel):
         col.itemR(rl, "solid")
         col.itemR(rl, "halo")
         col.itemR(rl, "ztransp")
-
-        col = split.column()
         col.itemR(rl, "sky")
+               
+        col = split.column()
         col.itemR(rl, "edge")
         col.itemR(rl, "strand")
+        col.itemR(rl, "freestyle")
 
         if rl.zmask:
             split = layout.split()
@@ -141,6 +142,33 @@ 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()
+
+            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")
+
+            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):
     bl_label = "Shading"
@@ -199,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")
@@ -243,6 +271,12 @@ class RENDER_PT_post_processing(RenderButtonsPanel):
         sub.itemR(rd, "edge_threshold", text="Threshold", slider=True)
         sub.itemR(rd, "edge_color", text="")
 
+        layout.itemS()
+
+        split = layout.split()
+        col = split.column()
+        col.itemR(rd, "freestyle", text="Freestyle")
+
 
 class RENDER_PT_output(RenderButtonsPanel):
     bl_label = "Output"