[Bf-blender-cvs] [859379ac487] master: Fix for missing "Use Freestyle" toggle in the Cycles "Layer" options panel.

[Tamito Kajiyama]

Commit: 859379ac487509f3eed96de5c78f934fbd3490d2
Author: Tamito Kajiyama
Date:   Fri Feb 9 02:46:20 2018 +0900
Branches: master
https://developer.blender.org/rB859379ac487509f3eed96de5c78f934fbd3490d2

Fix for missing "Use Freestyle" toggle in the Cycles "Layer" options panel.

Reviewed By: Brecht Van Lommel (brecht), Dalai Felinto (dfelinto)

Differential Revision: https://developer.blender.org/D3048

===================================================================

M	intern/cycles/blender/addon/ui.py

===================================================================

diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 07fd491dc04..e3076a8ec2c 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -449,6 +449,7 @@ class CYCLES_RENDER_PT_layer_options(CyclesButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
+        with_freestyle = bpy.app.build_options.freestyle
 
         scene = context.scene
         rd = scene.render
@@ -477,6 +478,10 @@ class CYCLES_RENDER_PT_layer_options(CyclesButtonsPanel, Panel):
         col.prop(rl, "use_ao", "Use AO")
         col.prop(rl, "use_solid", "Use Surfaces")
         col.prop(rl, "use_strand", "Use Hair")
+        if with_freestyle:
+            row = col.row()
+            row.prop(rl, "use_freestyle", "Use Freestyle")
+            row.active = rd.use_freestyle
 
 
 class CYCLES_RENDER_PT_layer_passes(CyclesButtonsPanel, Panel):