diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_freestyle.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_freestyle.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index c5716dff86d..58818e90440 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -39,7 +39,7 @@ class RenderFreestyleButtonsPanel(): class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): bl_label = "Freestyle" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'CYCLES'} def draw_header(self, context): rd = context.scene.render @@ -59,10 +59,6 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): if (rd.line_thickness_mode == 'ABSOLUTE'): layout.prop(rd, "line_thickness") - row = layout.row() - row.label(text="Line style settings are in the Render Layers tab") - row.operator("wm.properties_context_change", text="", icon='RENDERLAYERS').context = 'RENDER_LAYER' - # Render layer properties @@ -115,7 +111,7 @@ class RENDER_MT_lineset_specials(Menu): class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): bl_label = "Freestyle" - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'CYCLES'} def draw(self, context): layout = self.layout @@ -169,7 +165,7 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel): class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, Panel): bl_label = "Freestyle Line Set" - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'CYCLES'} def draw_edge_type_buttons(self, box, lineset, edge_type): # property names @@ -261,7 +257,7 @@ class RENDERLAYER_PT_freestyle_lineset(RenderLayerFreestyleEditorButtonsPanel, P class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, Panel): bl_label = "Freestyle Line Style" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'CYCLES'} def draw_modifier_box_header(self, box, modifier): row = box.row() @@ -678,7 +674,10 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, layout.separator() row = layout.row() - row.prop(linestyle, "use_texture") + if rd.use_shading_nodes: + row.prop(linestyle, "use_nodes") + else: + row.prop(linestyle, "use_texture") row.prop(linestyle, "texture_spacing", text="Spacing Along Stroke") row = layout.row() @@ -711,7 +710,7 @@ class MaterialFreestyleButtonsPanel(): class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel): bl_label = "Freestyle Line" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_RENDER'} # TODO: 'CYCLES' + COMPAT_ENGINES = {'BLENDER_RENDER', 'CYCLES'} def draw(self, context): layout = self.layout |