diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index cce3f805b39..3d0b2f721b4 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -782,10 +782,6 @@ class CYCLES_RENDER_PT_filter(CyclesButtonsPanel, Panel): col.prop(view_layer, "use_solid", text="Surfaces") col.prop(view_layer, "use_strand", text="Hair") col.prop(view_layer, "use_volumes", text="Volumes") - if with_freestyle: - sub = col.row(align=True) - sub.prop(view_layer, "use_freestyle", text="Freestyle") - sub.active = rd.use_freestyle class CYCLES_RENDER_PT_override(CyclesButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index f70789ebeed..54b1ca3d910 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -115,6 +115,15 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): bl_label = "Freestyle" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE'} + def draw_header(self, context): + view_layer = context.view_layer + rd = context.scene.render + + layout = self.layout + + layout.active = rd.use_freestyle + layout.prop(view_layer, "use_freestyle", text="") + def draw(self, context): layout = self.layout |