Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2018-02-08 20:46:20 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2018-02-08 20:48:21 +0300
commit859379ac487509f3eed96de5c78f934fbd3490d2 (patch)
tree2d7936938dea3744940c637c8c210a36c7900493
parent29d2ff7b31aef4fe490446e8a82fdc34021e2592 (diff)
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
-rw-r--r--intern/cycles/blender/addon/ui.py5
1 files changed, 5 insertions, 0 deletions
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):