UI: Freestyle UI Upgrade
Suggested and funded by [[ https://blendernpr.org/| BNPR ]], this patch aims to update the long not-updated Freestyle UI **Why do the UI upgrade:** - Freestyle UI doesn't match the rest of Blender UI, it was neglected for a long time - The current UI makes Freestyle workflows tedious and distracting **Highlights:** For before/after screenshots see https://developer.blender.org/D10505 Video: https://youtu.be/qaXhuJW_c9U Workflow video (older revision): https://youtu.be/IqbjIq_A800 Doc patch (WIP): https://github.com/bnpr/FreestyleUIUpgrade/blob/main/freestyle-ui-upgrade-docs.diff Reviewed By: #user_interface, Blendify, HooglyBoogly, Severin Differential Revision: https://developer.blender.org/D10505
This commit is contained in:
Iyad Ahmed
committed by
Aaron Carlisle
Aaron Carlisle
parent
c9c890f196
commit
6f52ebba19
@@ -22,7 +22,6 @@ from bpy.types import Menu, Panel, UIList
|
||||
|
||||
|
||||
# Render properties
|
||||
|
||||
class RenderFreestyleButtonsPanel:
|
||||
bl_space_type = 'PROPERTIES'
|
||||
bl_region_type = 'WINDOW'
|
||||
@@ -49,20 +48,17 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel):
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False # No animation.
|
||||
|
||||
layout.use_property_decorate = False
|
||||
rd = context.scene.render
|
||||
|
||||
layout.active = rd.use_freestyle
|
||||
|
||||
layout.prop(rd, "line_thickness_mode", expand=True)
|
||||
|
||||
layout.row().prop(rd, "line_thickness_mode", expand=True, text="Line Thickness Mode")
|
||||
if rd.line_thickness_mode == 'ABSOLUTE':
|
||||
layout.prop(rd, "line_thickness")
|
||||
|
||||
|
||||
# Render layer properties
|
||||
|
||||
|
||||
class ViewLayerFreestyleButtonsPanel:
|
||||
bl_space_type = 'PROPERTIES'
|
||||
bl_region_type = 'WINDOW'
|
||||
@@ -76,8 +72,12 @@ class ViewLayerFreestyleButtonsPanel:
|
||||
rd = scene.render
|
||||
with_freestyle = bpy.app.build_options.freestyle
|
||||
|
||||
return (scene and with_freestyle and rd.use_freestyle and
|
||||
(context.engine in cls.COMPAT_ENGINES))
|
||||
return (
|
||||
scene
|
||||
and with_freestyle
|
||||
and rd.use_freestyle
|
||||
and (context.engine in cls.COMPAT_ENGINES)
|
||||
)
|
||||
|
||||
|
||||
class ViewLayerFreestyleEditorButtonsPanel(ViewLayerFreestyleButtonsPanel):
|
||||
@@ -88,7 +88,35 @@ class ViewLayerFreestyleEditorButtonsPanel(ViewLayerFreestyleButtonsPanel):
|
||||
if not super().poll(context):
|
||||
return False
|
||||
view_layer = context.view_layer
|
||||
return view_layer and view_layer.freestyle_settings.mode == 'EDITOR'
|
||||
return (
|
||||
view_layer
|
||||
and view_layer.use_freestyle
|
||||
and view_layer.freestyle_settings.mode == 'EDITOR'
|
||||
)
|
||||
|
||||
|
||||
class ViewLayerFreestyleLineStyle(ViewLayerFreestyleEditorButtonsPanel):
|
||||
# Freestyle Linestyle Panels
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
|
||||
@classmethod
|
||||
def poll(cls, context):
|
||||
if not super().poll(context):
|
||||
return False
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
if lineset is None:
|
||||
return False
|
||||
linestyle = lineset.linestyle
|
||||
if linestyle is None:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
class ViewLayerFreestyleLinestyleStrokesSubPanel(ViewLayerFreestyleLineStyle):
|
||||
# Freestyle Linestyle Strokes sub panels
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_linestyle_strokes"
|
||||
|
||||
|
||||
class VIEWLAYER_UL_linesets(UIList):
|
||||
@@ -126,54 +154,85 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel):
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
row = layout.row()
|
||||
layout.prop(freestyle, "mode", text="Control Mode")
|
||||
layout.prop(freestyle, "use_view_map_cache", text="View Map Cache")
|
||||
layout.prop(freestyle, "as_render_pass", text="As Render Pass")
|
||||
layout.label(text="Edge Detection Options:")
|
||||
col = layout.column(align=True)
|
||||
col.prop(freestyle, "mode", text="Control Mode")
|
||||
col.prop(freestyle, "use_view_map_cache", text="View Map Cache")
|
||||
col.prop(freestyle, "as_render_pass", text="As Render Pass")
|
||||
|
||||
split = layout.split()
|
||||
|
||||
col = split.column()
|
||||
class VIEWLAYER_PT_freestyle_edge_detection_options(ViewLayerFreestyleButtonsPanel, Panel):
|
||||
bl_label = "Edge Detection Options"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
col = layout.column()
|
||||
col.prop(freestyle, "crease_angle")
|
||||
col.prop(freestyle, "use_culling")
|
||||
col.prop(freestyle, "use_advanced_options")
|
||||
|
||||
col = split.column()
|
||||
col.prop(freestyle, "use_smoothness")
|
||||
|
||||
if freestyle.mode == 'SCRIPT':
|
||||
col.prop(freestyle, "use_material_boundaries")
|
||||
|
||||
# Advanced options are hidden by default to warn new users
|
||||
if freestyle.use_advanced_options:
|
||||
if freestyle.mode == 'SCRIPT':
|
||||
row = layout.row()
|
||||
row.prop(freestyle, "use_ridges_and_valleys")
|
||||
row.prop(freestyle, "use_suggestive_contours")
|
||||
row = layout.row()
|
||||
row.prop(freestyle, "sphere_radius")
|
||||
row.prop(freestyle, "kr_derivative_epsilon")
|
||||
|
||||
if freestyle.mode == 'SCRIPT':
|
||||
row = layout.row()
|
||||
row.label(text="Style Modules:")
|
||||
row.operator("scene.freestyle_module_add", text="Add")
|
||||
for module in freestyle.modules:
|
||||
box = layout.box()
|
||||
box.context_pointer_set("freestyle_module", module)
|
||||
row = box.row(align=True)
|
||||
row.prop(module, "use", text="")
|
||||
row.prop(module, "script", text="")
|
||||
row.operator("scene.freestyle_module_open", icon='FILEBROWSER', text="")
|
||||
row.operator("scene.freestyle_module_remove", icon='X', text="")
|
||||
row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
col.prop(freestyle, "use_ridges_and_valleys")
|
||||
col.prop(freestyle, "use_suggestive_contours")
|
||||
col.prop(freestyle, "sphere_radius")
|
||||
col.prop(freestyle, "kr_derivative_epsilon")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_style_modules(ViewLayerFreestyleButtonsPanel, Panel):
|
||||
bl_label = "Style Modules"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
|
||||
@classmethod
|
||||
def poll(cls, context):
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
return freestyle.mode == 'SCRIPT'
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
col = layout.column()
|
||||
col.use_property_split = False
|
||||
row = col.row()
|
||||
row.operator("scene.freestyle_module_add", text="Add")
|
||||
for module in freestyle.modules:
|
||||
box = col.box()
|
||||
box.context_pointer_set("freestyle_module", module)
|
||||
row = box.row(align=True)
|
||||
row.prop(module, "use", text="")
|
||||
row.prop(module, "script", text="")
|
||||
row.operator("scene.freestyle_module_open", icon='FILEBROWSER', text="")
|
||||
row.operator("scene.freestyle_module_remove", icon='X', text="")
|
||||
row.operator("scene.freestyle_module_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
row.operator("scene.freestyle_module_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel):
|
||||
@@ -198,10 +257,13 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
row = layout.row()
|
||||
rows = 4 if lineset else 2
|
||||
|
||||
is_sortable = len(freestyle.linesets) > 1
|
||||
rows = 3
|
||||
if is_sortable:
|
||||
rows = 5
|
||||
|
||||
row.template_list(
|
||||
"VIEWLAYER_UL_linesets",
|
||||
"",
|
||||
@@ -212,157 +274,504 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel
|
||||
rows=rows,
|
||||
)
|
||||
|
||||
sub = row.column(align=True)
|
||||
sub.operator("scene.freestyle_lineset_add", icon='ADD', text="")
|
||||
sub.operator("scene.freestyle_lineset_remove", icon='REMOVE', text="")
|
||||
sub.menu("RENDER_MT_lineset_context_menu", icon='DOWNARROW_HLT', text="")
|
||||
col = row.column(align=True)
|
||||
col.operator("scene.freestyle_lineset_add", icon='ADD', text="")
|
||||
col.operator("scene.freestyle_lineset_remove", icon='REMOVE', text="")
|
||||
|
||||
col.separator()
|
||||
|
||||
col.menu("RENDER_MT_lineset_context_menu", icon="DOWNARROW_HLT", text="")
|
||||
|
||||
if is_sortable:
|
||||
col.separator()
|
||||
col.operator("scene.freestyle_lineset_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
col.operator("scene.freestyle_lineset_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
|
||||
if lineset:
|
||||
sub.separator()
|
||||
sub.separator()
|
||||
sub.operator("scene.freestyle_lineset_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
sub.operator("scene.freestyle_lineset_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
|
||||
col = layout.column()
|
||||
col.label(text="Selection By:")
|
||||
row = col.row(align=True)
|
||||
row.prop(lineset, "select_by_visibility", text="Visibility", toggle=True)
|
||||
row.prop(lineset, "select_by_edge_types", text="Edge Types", toggle=True)
|
||||
row.prop(lineset, "select_by_face_marks", text="Face Marks", toggle=True)
|
||||
row.prop(lineset, "select_by_collection", text="Collection", toggle=True)
|
||||
row.prop(lineset, "select_by_image_border", text="Image Border", toggle=True)
|
||||
|
||||
if lineset.select_by_visibility:
|
||||
col.label(text="Visibility:")
|
||||
row = col.row(align=True)
|
||||
row.prop(lineset, "visibility", expand=True)
|
||||
if lineset.visibility == 'RANGE':
|
||||
row = col.row(align=True)
|
||||
row.prop(lineset, "qi_start")
|
||||
row.prop(lineset, "qi_end")
|
||||
|
||||
if lineset.select_by_edge_types:
|
||||
col.label(text="Edge Types:")
|
||||
row = col.row()
|
||||
row.prop(lineset, "edge_type_negation", expand=True)
|
||||
row.prop(lineset, "edge_type_combination", expand=True)
|
||||
|
||||
split = col.split()
|
||||
|
||||
sub = split.column()
|
||||
self.draw_edge_type_buttons(sub, lineset, "silhouette")
|
||||
self.draw_edge_type_buttons(sub, lineset, "border")
|
||||
self.draw_edge_type_buttons(sub, lineset, "contour")
|
||||
self.draw_edge_type_buttons(sub, lineset, "suggestive_contour")
|
||||
self.draw_edge_type_buttons(sub, lineset, "ridge_valley")
|
||||
|
||||
sub = split.column()
|
||||
self.draw_edge_type_buttons(sub, lineset, "crease")
|
||||
self.draw_edge_type_buttons(sub, lineset, "edge_mark")
|
||||
self.draw_edge_type_buttons(sub, lineset, "external_contour")
|
||||
self.draw_edge_type_buttons(sub, lineset, "material_boundary")
|
||||
|
||||
if lineset.select_by_face_marks:
|
||||
col.label(text="Face Marks:")
|
||||
row = col.row()
|
||||
row.prop(lineset, "face_mark_negation", expand=True)
|
||||
row.prop(lineset, "face_mark_condition", expand=True)
|
||||
|
||||
if lineset.select_by_collection:
|
||||
col.label(text="Collection:")
|
||||
row = col.row()
|
||||
row.prop(lineset, "collection", text="")
|
||||
row.prop(lineset, "collection_negation", expand=True)
|
||||
layout.template_ID(lineset, "linestyle", new="scene.freestyle_linestyle_new")
|
||||
layout.separator()
|
||||
col = layout.column(heading="Select by")
|
||||
col.use_property_split = True
|
||||
col.use_property_decorate = False
|
||||
col.prop(lineset, "select_by_image_border", text="Image Border")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Panel):
|
||||
bl_label = "Freestyle Line Style"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
# Freestyle Lineset Sub Panels
|
||||
class VIEWLAYER_PT_freestyle_lineset_visibilty(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Visibility"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_lineset"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
|
||||
def draw_modifier_box_header(self, box, modifier):
|
||||
row = box.row()
|
||||
row.context_pointer_set("modifier", modifier)
|
||||
if modifier.expanded:
|
||||
icon = 'TRIA_DOWN'
|
||||
else:
|
||||
icon = 'TRIA_RIGHT'
|
||||
row.prop(modifier, "expanded", text="", icon=icon, emboss=False)
|
||||
# TODO: Use icons rather than text label, would save some room!
|
||||
row.label(text=modifier.rna_type.name)
|
||||
row.prop(modifier, "name", text="")
|
||||
if modifier.use:
|
||||
icon = 'RESTRICT_RENDER_OFF'
|
||||
else:
|
||||
icon = 'RESTRICT_RENDER_ON'
|
||||
row.prop(modifier, "use", text="", icon=icon)
|
||||
sub = row.row(align=True)
|
||||
sub.operator("scene.freestyle_modifier_copy", icon='NONE', text="Copy")
|
||||
sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
sub.operator("scene.freestyle_modifier_remove", icon='X', text="")
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
def draw_modifier_box_error(self, box, _modifier, message):
|
||||
row = box.row()
|
||||
row.label(text=message, icon='ERROR')
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
def draw_modifier_common(self, box, modifier):
|
||||
row = box.row()
|
||||
row.prop(modifier, "blend", text="")
|
||||
row.prop(modifier, "influence")
|
||||
layout.prop(lineset, "select_by_visibility", text="")
|
||||
|
||||
def draw_modifier_color_ramp_common(self, box, modifier, has_range):
|
||||
box.template_color_ramp(modifier, "color_ramp", expand=True)
|
||||
if has_range:
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "range_min")
|
||||
row.prop(modifier, "range_max")
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
def draw_modifier_curve_common(self, box, modifier, has_range, has_value):
|
||||
row = box.row()
|
||||
row.prop(modifier, "mapping", text="")
|
||||
sub = row.column()
|
||||
sub.prop(modifier, "invert")
|
||||
if modifier.mapping == 'CURVE':
|
||||
sub.active = False
|
||||
box.template_curve_mapping(modifier, "curve")
|
||||
if has_range:
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "range_min")
|
||||
row.prop(modifier, "range_max")
|
||||
if has_value:
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "value_min")
|
||||
row.prop(modifier, "value_max")
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.active = lineset.select_by_visibility
|
||||
col = layout.column(align=True, heading="Type")
|
||||
col.prop(lineset, "visibility", text="Type", expand=False)
|
||||
|
||||
if lineset.visibility == 'RANGE':
|
||||
col = layout.column(align=True)
|
||||
col.use_property_split = True
|
||||
col.prop(lineset, "qi_start")
|
||||
col.prop(lineset, "qi_end")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_lineset_edgetype(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Edge Type"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_lineset"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.prop(lineset, "select_by_edge_types", text="")
|
||||
|
||||
def draw_edge_type_buttons(self, box, lineset, edge_type):
|
||||
# property names
|
||||
select_edge_type = "select_" + edge_type
|
||||
exclude_edge_type = "exclude_" + edge_type
|
||||
# draw edge type buttons
|
||||
row = box.row(align=True)
|
||||
row.prop(lineset, select_edge_type)
|
||||
sub = row.column(align=True)
|
||||
sub.prop(lineset, exclude_edge_type, text="")
|
||||
sub.active = getattr(lineset, select_edge_type)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.active = lineset.select_by_edge_types
|
||||
layout.row().prop(lineset, "edge_type_negation", expand=True, text="Negation")
|
||||
layout.row().prop(lineset, "edge_type_combination", expand=True, text="Combination")
|
||||
|
||||
col = layout.column(heading="Type")
|
||||
self.draw_edge_type_buttons(col, lineset, "silhouette")
|
||||
self.draw_edge_type_buttons(col, lineset, "crease")
|
||||
self.draw_edge_type_buttons(col, lineset, "border")
|
||||
self.draw_edge_type_buttons(col, lineset, "edge_mark")
|
||||
self.draw_edge_type_buttons(col, lineset, "contour")
|
||||
self.draw_edge_type_buttons(col, lineset, "external_contour")
|
||||
self.draw_edge_type_buttons(col, lineset, "material_boundary")
|
||||
self.draw_edge_type_buttons(col, lineset, "suggestive_contour")
|
||||
self.draw_edge_type_buttons(col, lineset, "ridge_valley")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_lineset_facemarks(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Face Marks"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_lineset"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.prop(lineset, "select_by_face_marks", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.active = lineset.select_by_face_marks
|
||||
layout.row().prop(lineset, "face_mark_negation", expand=True, text="Negation")
|
||||
layout.row().prop(lineset, "face_mark_condition", expand=True, text="Condition")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_lineset_collection(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Collection"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_lineset"
|
||||
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.prop(lineset, "select_by_collection", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
layout.active = lineset.select_by_collection
|
||||
layout.row().prop(lineset, "collection", text="Freestyle Lineset Collection")
|
||||
layout.row().prop(lineset, "collection_negation", expand=True, text="Negation")
|
||||
|
||||
|
||||
# Linestyle Modifier Drawing code
|
||||
def draw_modifier_box_header(box, modifier):
|
||||
row = box.row()
|
||||
row.use_property_split = False
|
||||
row.context_pointer_set("modifier", modifier)
|
||||
if modifier.expanded:
|
||||
icon = 'TRIA_DOWN'
|
||||
else:
|
||||
icon = 'TRIA_RIGHT'
|
||||
row.prop(modifier, "expanded", text="", icon=icon, emboss=False)
|
||||
|
||||
sub = row.row(align=True)
|
||||
sub.prop(modifier, "name", text="")
|
||||
if modifier.use:
|
||||
icon = 'RESTRICT_RENDER_OFF'
|
||||
else:
|
||||
icon = 'RESTRICT_RENDER_ON'
|
||||
sub.prop(modifier, "use", text="", icon=icon)
|
||||
sub.operator("scene.freestyle_modifier_copy", icon='DUPLICATE', text="")
|
||||
|
||||
sub = row.row(align=True)
|
||||
sub.operator("scene.freestyle_modifier_move", icon='TRIA_UP', text="").direction = 'UP'
|
||||
sub.operator("scene.freestyle_modifier_move", icon='TRIA_DOWN', text="").direction = 'DOWN'
|
||||
|
||||
row.operator("scene.freestyle_modifier_remove", icon='X', text="", emboss=False)
|
||||
|
||||
|
||||
def draw_modifier_box_error(box, _modifier, message):
|
||||
row = box.row()
|
||||
row.label(text=message, icon='ERROR')
|
||||
|
||||
|
||||
def draw_modifier_common(box, modifier):
|
||||
col = box.column()
|
||||
col.prop(modifier, "blend", text="Blend Mode")
|
||||
col.prop(modifier, "influence")
|
||||
|
||||
|
||||
def draw_modifier_color_ramp_common(box, modifier, has_range):
|
||||
box.template_color_ramp(modifier, "color_ramp", expand=True)
|
||||
if has_range:
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "range_min", text="Range Min")
|
||||
col.prop(modifier, "range_max", text="Max")
|
||||
|
||||
|
||||
def draw_modifier_curve_common(box, modifier, has_range, has_value):
|
||||
row = box.row()
|
||||
row.prop(modifier, "mapping", text="Mapping")
|
||||
if modifier.mapping == 'LINEAR':
|
||||
box.prop(modifier, "invert")
|
||||
if has_range:
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "range_min", text="Range Min")
|
||||
col.prop(modifier, "range_max", text="Max")
|
||||
if has_value:
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "value_min", text="Value Min")
|
||||
col.prop(modifier, "value_max", text="Max")
|
||||
if modifier.mapping == 'CURVE':
|
||||
box.template_curve_mapping(modifier, "curve")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Strokes"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
if lineset is None:
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
col = layout.column(align=True)
|
||||
col.prop(linestyle, "caps", expand=False)
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_chaining(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Chaining"
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
linestyle = lineset.linestyle
|
||||
layout.prop(linestyle, "use_chaining", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
layout.active = linestyle.use_chaining
|
||||
layout.row().prop(linestyle, "chaining", expand=True, text="Method")
|
||||
if linestyle.chaining == 'SKETCHY':
|
||||
layout.prop(linestyle, "rounds")
|
||||
layout.prop(linestyle, "use_same_object")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_splitting(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Splitting"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
row = layout.row(align=False, heading="Min 2D Angle")
|
||||
row.prop(linestyle, "use_angle_min", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_angle_min
|
||||
sub.prop(linestyle, "angle_min", text="")
|
||||
|
||||
row = layout.row(align=False, heading="Max 2D Angle")
|
||||
row.prop(linestyle, "use_angle_max", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_angle_max
|
||||
sub.prop(linestyle, "angle_max", text="")
|
||||
|
||||
row = layout.row(align=False, heading="2D Length")
|
||||
row.prop(linestyle, "use_split_length", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_split_length
|
||||
sub.prop(linestyle, "split_length", text="")
|
||||
|
||||
layout.prop(linestyle, "material_boundary")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_splitting_pattern(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Split Pattern"
|
||||
bl_parent_id = "VIEWLAYER_PT_freestyle_linestyle_strokes_splitting"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
linestyle = lineset.linestyle
|
||||
layout.prop(linestyle, "use_split_pattern", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
layout.active = linestyle.use_split_pattern
|
||||
|
||||
col = layout.column(align=True)
|
||||
col.prop(linestyle, "split_dash1", text="Dash 1")
|
||||
col.prop(linestyle, "split_dash2", text="2")
|
||||
col.prop(linestyle, "split_dash3", text="3")
|
||||
col = layout.column(align=True)
|
||||
col.prop(linestyle, "split_gap1", text="Gap 1")
|
||||
col.prop(linestyle, "split_gap2", text="2")
|
||||
col.prop(linestyle, "split_gap3", text="3")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_sorting(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Sorting"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
linestyle = lineset.linestyle
|
||||
layout.prop(linestyle, "use_sorting", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
layout.active = linestyle.use_sorting
|
||||
|
||||
layout.prop(linestyle, "sort_key")
|
||||
|
||||
row = layout.row()
|
||||
row.active = linestyle.sort_key in {
|
||||
'DISTANCE_FROM_CAMERA',
|
||||
'PROJECTED_X',
|
||||
'PROJECTED_Y',
|
||||
}
|
||||
row.prop(linestyle, "integration_type")
|
||||
layout.row().prop(linestyle, "sort_order", expand=True, text="Sort Order")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_selection(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Selection"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
row = layout.row(align=False, heading="Min 2D Length")
|
||||
row.prop(linestyle, "use_length_min", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_length_min
|
||||
sub.prop(linestyle, "length_min", text="")
|
||||
|
||||
row = layout.row(align=False, heading="Max 2D Length")
|
||||
row.prop(linestyle, "use_length_max", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_length_max
|
||||
sub.prop(linestyle, "length_max", text="")
|
||||
|
||||
row = layout.row(align=False, heading="Chain Count")
|
||||
row.prop(linestyle, "use_chain_count", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_chain_count
|
||||
sub.prop(linestyle, "chain_count", text="")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_strokes_dashedline(ViewLayerFreestyleLinestyleStrokesSubPanel, Panel):
|
||||
bl_label = "Dashed Line"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_header(self, context):
|
||||
layout = self.layout
|
||||
|
||||
view_layer = context.view_layer
|
||||
freestyle = view_layer.freestyle_settings
|
||||
lineset = freestyle.linesets.active
|
||||
|
||||
linestyle = lineset.linestyle
|
||||
layout.prop(linestyle, "use_dashed_line", text="")
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
layout.active = linestyle.use_dashed_line
|
||||
|
||||
col = layout.column(align=True)
|
||||
col.prop(linestyle, "dash1", text="Dash 1")
|
||||
col.prop(linestyle, "dash2", text="2")
|
||||
col.prop(linestyle, "dash3", text="3")
|
||||
col = layout.column(align=True)
|
||||
col.prop(linestyle, "gap1", text="Gap 1")
|
||||
col.prop(linestyle, "gap2", text="2")
|
||||
col.prop(linestyle, "gap3", text="3")
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_color(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Color"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_color_modifier(self, context, modifier):
|
||||
layout = self.layout
|
||||
|
||||
col = layout.column(align=True)
|
||||
self.draw_modifier_box_header(col.box(), modifier)
|
||||
draw_modifier_box_header(col.box(), modifier)
|
||||
if modifier.expanded:
|
||||
box = col.box()
|
||||
self.draw_modifier_common(box, modifier)
|
||||
draw_modifier_common(box, modifier)
|
||||
|
||||
if modifier.type == 'ALONG_STROKE':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_OBJECT':
|
||||
box.prop(modifier, "target")
|
||||
self.draw_modifier_color_ramp_common(box, modifier, True)
|
||||
draw_modifier_color_ramp_common(box, modifier, True)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'COLOR'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_CAMERA':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, True)
|
||||
draw_modifier_color_ramp_common(box, modifier, True)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'COLOR'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'MATERIAL':
|
||||
row = box.row()
|
||||
row.prop(modifier, "material_attribute", text="")
|
||||
sub = row.column()
|
||||
row.prop(modifier, "material_attribute",
|
||||
text="Material Attribute")
|
||||
sub = box.column()
|
||||
sub.prop(modifier, "use_ramp")
|
||||
if modifier.material_attribute in {'LINE', 'DIFF', 'SPEC'}:
|
||||
sub.active = True
|
||||
@@ -371,166 +780,292 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
|
||||
sub.active = False
|
||||
show_ramp = True
|
||||
if show_ramp:
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
elif modifier.type == 'TANGENT':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
elif modifier.type == 'NOISE':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
row = box.row(align=False)
|
||||
row.prop(modifier, "amplitude")
|
||||
row.prop(modifier, "period")
|
||||
row.prop(modifier, "seed")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "amplitude")
|
||||
subcol.prop(modifier, "period")
|
||||
subcol.prop(modifier, "seed")
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
elif modifier.type == 'CREASE_ANGLE':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "angle_min")
|
||||
row.prop(modifier, "angle_max")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "angle_min", text="Angle Min")
|
||||
subcol.prop(modifier, "angle_max", text="Max")
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
elif modifier.type == 'CURVATURE_3D':
|
||||
self.draw_modifier_color_ramp_common(box, modifier, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "curvature_min")
|
||||
row.prop(modifier, "curvature_max")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "curvature_min", text="Curvature Min")
|
||||
subcol.prop(modifier, "curvature_max", text="Max")
|
||||
|
||||
draw_modifier_color_ramp_common(box, modifier, False)
|
||||
|
||||
freestyle = context.view_layer.freestyle_settings
|
||||
if not freestyle.use_smoothness:
|
||||
message = "Enable Face Smoothness to use this modifier"
|
||||
self.draw_modifier_box_error(col.box(), modifier, message)
|
||||
draw_modifier_box_error(col.box(), modifier, message)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
if lineset is None:
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.prop(linestyle, "color", text="Base Color")
|
||||
col.operator_menu_enum("scene.freestyle_color_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.color_modifiers:
|
||||
self.draw_color_modifier(context, modifier)
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_alpha(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Alpha"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_alpha_modifier(self, context, modifier):
|
||||
layout = self.layout
|
||||
|
||||
col = layout.column(align=True)
|
||||
self.draw_modifier_box_header(col.box(), modifier)
|
||||
draw_modifier_box_header(col.box(), modifier)
|
||||
if modifier.expanded:
|
||||
box = col.box()
|
||||
self.draw_modifier_common(box, modifier)
|
||||
draw_modifier_common(box, modifier)
|
||||
|
||||
if modifier.type == 'ALONG_STROKE':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_OBJECT':
|
||||
box.prop(modifier, "target")
|
||||
self.draw_modifier_curve_common(box, modifier, True, False)
|
||||
draw_modifier_curve_common(box, modifier, True, False)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'ALPHA'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_CAMERA':
|
||||
self.draw_modifier_curve_common(box, modifier, True, False)
|
||||
draw_modifier_curve_common(box, modifier, True, False)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'ALPHA'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'MATERIAL':
|
||||
box.prop(modifier, "material_attribute", text="")
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
box.prop(modifier, "material_attribute", text="Material Attribute")
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'TANGENT':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'NOISE':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
row = box.row(align=False)
|
||||
row.prop(modifier, "amplitude")
|
||||
row.prop(modifier, "period")
|
||||
row.prop(modifier, "seed")
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "amplitude")
|
||||
col.prop(modifier, "period")
|
||||
col.prop(modifier, "seed")
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'CREASE_ANGLE':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "angle_min")
|
||||
row.prop(modifier, "angle_max")
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "angle_min", text="Angle Min")
|
||||
col.prop(modifier, "angle_max", text="Max")
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'CURVATURE_3D':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "curvature_min")
|
||||
row.prop(modifier, "curvature_max")
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "curvature_min", text="Curvature Min")
|
||||
subcol.prop(modifier, "curvature_max", text="Max")
|
||||
|
||||
freestyle = context.view_layer.freestyle_settings
|
||||
if not freestyle.use_smoothness:
|
||||
message = "Enable Face Smoothness to use this modifier"
|
||||
self.draw_modifier_box_error(col.box(), modifier, message)
|
||||
draw_modifier_box_error(col.box(), modifier, message)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
if lineset is None:
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.prop(linestyle, "alpha", text="Base Transparency")
|
||||
col.operator_menu_enum("scene.freestyle_alpha_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.alpha_modifiers:
|
||||
self.draw_alpha_modifier(context, modifier)
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_thickness(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Thickness"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_thickness_modifier(self, context, modifier):
|
||||
layout = self.layout
|
||||
|
||||
col = layout.column(align=True)
|
||||
self.draw_modifier_box_header(col.box(), modifier)
|
||||
draw_modifier_box_header(col.box(), modifier)
|
||||
if modifier.expanded:
|
||||
box = col.box()
|
||||
self.draw_modifier_common(box, modifier)
|
||||
draw_modifier_common(box, modifier)
|
||||
|
||||
if modifier.type == 'ALONG_STROKE':
|
||||
self.draw_modifier_curve_common(box, modifier, False, True)
|
||||
draw_modifier_curve_common(box, modifier, False, True)
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_OBJECT':
|
||||
box.prop(modifier, "target")
|
||||
self.draw_modifier_curve_common(box, modifier, True, True)
|
||||
draw_modifier_curve_common(box, modifier, True, True)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'THICKNESS'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'DISTANCE_FROM_CAMERA':
|
||||
self.draw_modifier_curve_common(box, modifier, True, True)
|
||||
draw_modifier_curve_common(box, modifier, True, True)
|
||||
prop = box.operator("scene.freestyle_fill_range_by_selection")
|
||||
prop.type = 'THICKNESS'
|
||||
prop.name = modifier.name
|
||||
|
||||
elif modifier.type == 'MATERIAL':
|
||||
box.prop(modifier, "material_attribute", text="")
|
||||
self.draw_modifier_curve_common(box, modifier, False, True)
|
||||
box.prop(modifier, "material_attribute", text="Material Attribute")
|
||||
draw_modifier_curve_common(box, modifier, False, True)
|
||||
|
||||
elif modifier.type == 'CALLIGRAPHY':
|
||||
box.prop(modifier, "orientation")
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "thickness_min")
|
||||
row.prop(modifier, "thickness_max")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "thickness_min", text="Thickness Min")
|
||||
subcol.prop(modifier, "thickness_max", text="Max")
|
||||
|
||||
elif modifier.type == 'TANGENT':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
self.mapping = 'CURVE'
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "thickness_min")
|
||||
row.prop(modifier, "thickness_max")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "thickness_min", text="Thickness Min")
|
||||
subcol.prop(modifier, "thickness_max", text="Max")
|
||||
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'NOISE':
|
||||
row = box.row(align=False)
|
||||
row.prop(modifier, "amplitude")
|
||||
row.prop(modifier, "period")
|
||||
row = box.row(align=False)
|
||||
row.prop(modifier, "seed")
|
||||
row.prop(modifier, "use_asymmetric")
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "amplitude")
|
||||
col.prop(modifier, "period")
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "seed")
|
||||
col.prop(modifier, "use_asymmetric")
|
||||
|
||||
elif modifier.type == 'CREASE_ANGLE':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "thickness_min")
|
||||
row.prop(modifier, "thickness_max")
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "angle_min")
|
||||
row.prop(modifier, "angle_max")
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "thickness_min", text="Thickness Min")
|
||||
col.prop(modifier, "thickness_max", text="Max")
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "angle_min", text="Angle Min")
|
||||
col.prop(modifier, "angle_max", text="Max")
|
||||
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
elif modifier.type == 'CURVATURE_3D':
|
||||
self.draw_modifier_curve_common(box, modifier, False, False)
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "thickness_min")
|
||||
row.prop(modifier, "thickness_max")
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "curvature_min")
|
||||
row.prop(modifier, "curvature_max")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "thickness_min", text="Thickness Min")
|
||||
subcol.prop(modifier, "thickness_max", text="Max")
|
||||
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "curvature_min")
|
||||
subcol.prop(modifier, "curvature_max")
|
||||
|
||||
draw_modifier_curve_common(box, modifier, False, False)
|
||||
|
||||
freestyle = context.view_layer.freestyle_settings
|
||||
if not freestyle.use_smoothness:
|
||||
message = "Enable Face Smoothness to use this modifier"
|
||||
self.draw_modifier_box_error(col.box(), modifier, message)
|
||||
draw_modifier_box_error(col.box(), modifier, message)
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
if lineset is None:
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.prop(linestyle, "thickness", text="Base Thickness")
|
||||
subcol = col.column()
|
||||
subcol.active = linestyle.chaining == 'PLAIN' and linestyle.use_same_object
|
||||
row = subcol.row()
|
||||
row.prop(linestyle, "thickness_position", expand=False)
|
||||
|
||||
if linestyle.thickness_position == 'RELATIVE':
|
||||
row = subcol.row()
|
||||
row.prop(linestyle, "thickness_ratio")
|
||||
|
||||
col = layout.column()
|
||||
col.operator_menu_enum("scene.freestyle_thickness_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.thickness_modifiers:
|
||||
self.draw_thickness_modifier(context, modifier)
|
||||
|
||||
|
||||
class VIEWLAYER_PT_freestyle_linestyle_geometry(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Geometry"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
def draw_geometry_modifier(self, _context, modifier):
|
||||
layout = self.layout
|
||||
|
||||
col = layout.column(align=True)
|
||||
self.draw_modifier_box_header(col.box(), modifier)
|
||||
draw_modifier_box_header(col.box(), modifier)
|
||||
if modifier.expanded:
|
||||
box = col.box()
|
||||
|
||||
@@ -541,40 +1076,40 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
|
||||
box.prop(modifier, "error")
|
||||
|
||||
elif modifier.type == 'SINUS_DISPLACEMENT':
|
||||
split = box.split()
|
||||
col = split.column()
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "wavelength")
|
||||
col.prop(modifier, "amplitude")
|
||||
col = split.column()
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "phase")
|
||||
|
||||
elif modifier.type == 'SPATIAL_NOISE':
|
||||
split = box.split()
|
||||
col = split.column()
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "amplitude")
|
||||
col.prop(modifier, "scale")
|
||||
col.prop(modifier, "octaves")
|
||||
col = split.column()
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "smooth")
|
||||
col.prop(modifier, "use_pure_random")
|
||||
|
||||
elif modifier.type == 'PERLIN_NOISE_1D':
|
||||
split = box.split()
|
||||
col = split.column()
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "frequency")
|
||||
col.prop(modifier, "amplitude")
|
||||
col.prop(modifier, "seed")
|
||||
col = split.column()
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "octaves")
|
||||
col.prop(modifier, "angle")
|
||||
|
||||
elif modifier.type == 'PERLIN_NOISE_2D':
|
||||
split = box.split()
|
||||
col = split.column()
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "frequency")
|
||||
col.prop(modifier, "amplitude")
|
||||
col.prop(modifier, "seed")
|
||||
col = split.column()
|
||||
|
||||
col = box.column(align=True)
|
||||
col.prop(modifier, "octaves")
|
||||
col.prop(modifier, "angle")
|
||||
|
||||
@@ -594,33 +1129,34 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
|
||||
row = box.row()
|
||||
row.prop(modifier, "shape", expand=True)
|
||||
box.prop(modifier, "rounds")
|
||||
row = box.row()
|
||||
subcol = box.column(align=True)
|
||||
if modifier.shape in {'CIRCLES', 'ELLIPSES'}:
|
||||
row.prop(modifier, "random_radius")
|
||||
row.prop(modifier, "random_center")
|
||||
subcol.prop(modifier, "random_radius", text="Random Radius")
|
||||
subcol.prop(modifier, "random_center", text="Center")
|
||||
elif modifier.shape == 'SQUARES':
|
||||
row.prop(modifier, "backbone_length")
|
||||
row.prop(modifier, "random_backbone")
|
||||
subcol.prop(modifier, "backbone_length", text="Backbone Length")
|
||||
subcol.prop(modifier, "random_backbone", text="Randomness")
|
||||
|
||||
elif modifier.type == '2D_OFFSET':
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "start")
|
||||
row.prop(modifier, "end")
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "x")
|
||||
row.prop(modifier, "y")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "start")
|
||||
subcol.prop(modifier, "end")
|
||||
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "x")
|
||||
subcol.prop(modifier, "y")
|
||||
|
||||
elif modifier.type == '2D_TRANSFORM':
|
||||
box.prop(modifier, "pivot")
|
||||
if modifier.pivot == 'PARAM':
|
||||
box.prop(modifier, "pivot_u")
|
||||
elif modifier.pivot == 'ABSOLUTE':
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "pivot_x")
|
||||
row.prop(modifier, "pivot_y")
|
||||
row = box.row(align=True)
|
||||
row.prop(modifier, "scale_x")
|
||||
row.prop(modifier, "scale_y")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "pivot_x", text="Pivot X")
|
||||
subcol.prop(modifier, "pivot_y", text="Y")
|
||||
subcol = box.column(align=True)
|
||||
subcol.prop(modifier, "scale_x", text="Scale X")
|
||||
subcol.prop(modifier, "scale_y", text="Y")
|
||||
box.prop(modifier, "angle")
|
||||
|
||||
elif modifier.type == 'SIMPLIFICATION':
|
||||
@@ -628,6 +1164,8 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
|
||||
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
@@ -638,181 +1176,61 @@ class VIEWLAYER_PT_freestyle_linestyle(ViewLayerFreestyleEditorButtonsPanel, Pan
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
layout.template_ID(lineset, "linestyle", new="scene.freestyle_linestyle_new")
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
row = layout.row(align=True)
|
||||
row.prop(linestyle, "panel", expand=True)
|
||||
if linestyle.panel == 'STROKES':
|
||||
# Chaining
|
||||
layout.prop(linestyle, "use_chaining", text="Chaining:")
|
||||
split = layout.split(align=True)
|
||||
split.active = linestyle.use_chaining
|
||||
# First column
|
||||
col = split.column()
|
||||
col.active = linestyle.use_chaining
|
||||
col.prop(linestyle, "chaining", text="")
|
||||
if linestyle.chaining == 'SKETCHY':
|
||||
col.prop(linestyle, "rounds")
|
||||
# Second column
|
||||
col = split.column()
|
||||
col.prop(linestyle, "use_same_object")
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
# Splitting
|
||||
layout.label(text="Splitting:")
|
||||
split = layout.split(align=True)
|
||||
# First column
|
||||
col = split.column()
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_angle_min", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_angle_min
|
||||
sub.prop(linestyle, "angle_min")
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_angle_max", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_angle_max
|
||||
sub.prop(linestyle, "angle_max")
|
||||
# Second column
|
||||
col = split.column()
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_split_length", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_split_length
|
||||
sub.prop(linestyle, "split_length", text="2D Length")
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "material_boundary")
|
||||
# End of columns
|
||||
row = layout.row(align=True)
|
||||
row.prop(linestyle, "use_split_pattern", text="")
|
||||
sub = row.row(align=True)
|
||||
sub.active = linestyle.use_split_pattern
|
||||
sub.prop(linestyle, "split_dash1", text="D1")
|
||||
sub.prop(linestyle, "split_gap1", text="G1")
|
||||
sub.prop(linestyle, "split_dash2", text="D2")
|
||||
sub.prop(linestyle, "split_gap2", text="G2")
|
||||
sub.prop(linestyle, "split_dash3", text="D3")
|
||||
sub.prop(linestyle, "split_gap3", text="G3")
|
||||
col = layout.column()
|
||||
col.operator_menu_enum("scene.freestyle_geometry_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.geometry_modifiers:
|
||||
self.draw_geometry_modifier(context, modifier)
|
||||
|
||||
# Sorting
|
||||
layout.prop(linestyle, "use_sorting", text="Sorting:")
|
||||
col = layout.column()
|
||||
col.active = linestyle.use_sorting
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "sort_key", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.sort_key in {'DISTANCE_FROM_CAMERA',
|
||||
'PROJECTED_X',
|
||||
'PROJECTED_Y'}
|
||||
sub.prop(linestyle, "integration_type", text="")
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "sort_order", expand=True)
|
||||
|
||||
# Selection
|
||||
layout.label(text="Selection:")
|
||||
split = layout.split(align=True)
|
||||
# First column
|
||||
col = split.column()
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_length_min", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_length_min
|
||||
sub.prop(linestyle, "length_min")
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_length_max", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_length_max
|
||||
sub.prop(linestyle, "length_max")
|
||||
# Second column
|
||||
col = split.column()
|
||||
row = col.row(align=True)
|
||||
row.prop(linestyle, "use_chain_count", text="")
|
||||
sub = row.row()
|
||||
sub.active = linestyle.use_chain_count
|
||||
sub.prop(linestyle, "chain_count")
|
||||
class VIEWLAYER_PT_freestyle_linestyle_texture(ViewLayerFreestyleLineStyle, Panel):
|
||||
bl_label = "Freestyle Texture"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
# Caps
|
||||
layout.label(text="Caps:")
|
||||
row = layout.row(align=True)
|
||||
row.prop(linestyle, "caps", expand=True)
|
||||
def draw(self, context):
|
||||
layout = self.layout
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
# Dashed lines
|
||||
layout.prop(linestyle, "use_dashed_line", text="Dashed Line:")
|
||||
row = layout.row(align=True)
|
||||
row.active = linestyle.use_dashed_line
|
||||
row.prop(linestyle, "dash1", text="D1")
|
||||
row.prop(linestyle, "gap1", text="G1")
|
||||
row.prop(linestyle, "dash2", text="D2")
|
||||
row.prop(linestyle, "gap2", text="G2")
|
||||
row.prop(linestyle, "dash3", text="D3")
|
||||
row.prop(linestyle, "gap3", text="G3")
|
||||
view_layer = context.view_layer
|
||||
lineset = view_layer.freestyle_settings.linesets.active
|
||||
|
||||
elif linestyle.panel == 'COLOR':
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.label(text="Base Color:")
|
||||
row.prop(linestyle, "color", text="")
|
||||
col.label(text="Modifiers:")
|
||||
col.operator_menu_enum("scene.freestyle_color_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.color_modifiers:
|
||||
self.draw_color_modifier(context, modifier)
|
||||
layout.active = view_layer.use_freestyle
|
||||
|
||||
elif linestyle.panel == 'ALPHA':
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.label(text="Base Transparency:")
|
||||
row.prop(linestyle, "alpha")
|
||||
col.label(text="Modifiers:")
|
||||
col.operator_menu_enum("scene.freestyle_alpha_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.alpha_modifiers:
|
||||
self.draw_alpha_modifier(context, modifier)
|
||||
if lineset is None:
|
||||
return
|
||||
linestyle = lineset.linestyle
|
||||
|
||||
elif linestyle.panel == 'THICKNESS':
|
||||
col = layout.column()
|
||||
row = col.row()
|
||||
row.label(text="Base Thickness:")
|
||||
row.prop(linestyle, "thickness")
|
||||
subcol = col.column()
|
||||
subcol.active = linestyle.chaining == 'PLAIN' and linestyle.use_same_object
|
||||
row = subcol.row()
|
||||
row.prop(linestyle, "thickness_position", expand=True)
|
||||
row = subcol.row()
|
||||
row.prop(linestyle, "thickness_ratio")
|
||||
row.active = (linestyle.thickness_position == 'RELATIVE')
|
||||
col = layout.column()
|
||||
col.label(text="Modifiers:")
|
||||
col.operator_menu_enum("scene.freestyle_thickness_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.thickness_modifiers:
|
||||
self.draw_thickness_modifier(context, modifier)
|
||||
if linestyle is None:
|
||||
return
|
||||
|
||||
elif linestyle.panel == 'GEOMETRY':
|
||||
col = layout.column()
|
||||
col.label(text="Modifiers:")
|
||||
col.operator_menu_enum("scene.freestyle_geometry_modifier_add", "type", text="Add Modifier")
|
||||
for modifier in linestyle.geometry_modifiers:
|
||||
self.draw_geometry_modifier(context, modifier)
|
||||
row = layout.row(align=True)
|
||||
row.alignment = 'LEFT'
|
||||
row.label(text=lineset.name, icon='LINE_DATA')
|
||||
row.label(text="", icon='SMALL_TRI_RIGHT_VEC')
|
||||
row.label(text=linestyle.name)
|
||||
|
||||
elif linestyle.panel == 'TEXTURE':
|
||||
layout.separator()
|
||||
layout.prop(linestyle, "use_nodes")
|
||||
layout.prop(linestyle, "texture_spacing", text="Spacing Along Stroke")
|
||||
|
||||
row = layout.row()
|
||||
row.prop(linestyle, "use_nodes")
|
||||
row.prop(linestyle, "texture_spacing", text="Spacing Along Stroke")
|
||||
|
||||
row = layout.row()
|
||||
props = row.operator(
|
||||
"wm.properties_context_change",
|
||||
text="Go to Linestyle Textures Properties",
|
||||
icon='TEXTURE',
|
||||
)
|
||||
props.context = 'TEXTURE'
|
||||
|
||||
elif linestyle.panel == 'MISC':
|
||||
pass
|
||||
row = layout.row()
|
||||
props = row.operator(
|
||||
"wm.properties_context_change",
|
||||
text="Go to Linestyle Textures Properties",
|
||||
icon='TEXTURE',
|
||||
)
|
||||
props.context = 'TEXTURE'
|
||||
|
||||
|
||||
# Material properties
|
||||
|
||||
class MaterialFreestyleButtonsPanel:
|
||||
bl_space_type = 'PROPERTIES'
|
||||
bl_region_type = 'WINDOW'
|
||||
@@ -825,8 +1243,11 @@ class MaterialFreestyleButtonsPanel:
|
||||
material = context.material
|
||||
with_freestyle = bpy.app.build_options.freestyle
|
||||
return (
|
||||
with_freestyle and material and scene and scene.render.use_freestyle and
|
||||
(context.engine in cls.COMPAT_ENGINES)
|
||||
with_freestyle
|
||||
and material
|
||||
and scene
|
||||
and scene.render.use_freestyle
|
||||
and (context.engine in cls.COMPAT_ENGINES)
|
||||
)
|
||||
|
||||
|
||||
@@ -850,12 +1271,30 @@ classes = (
|
||||
VIEWLAYER_UL_linesets,
|
||||
RENDER_MT_lineset_context_menu,
|
||||
VIEWLAYER_PT_freestyle,
|
||||
VIEWLAYER_PT_freestyle_edge_detection_options,
|
||||
VIEWLAYER_PT_freestyle_style_modules,
|
||||
VIEWLAYER_PT_freestyle_lineset,
|
||||
VIEWLAYER_PT_freestyle_linestyle,
|
||||
VIEWLAYER_PT_freestyle_lineset_visibilty,
|
||||
VIEWLAYER_PT_freestyle_lineset_edgetype,
|
||||
VIEWLAYER_PT_freestyle_lineset_facemarks,
|
||||
VIEWLAYER_PT_freestyle_lineset_collection,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_chaining,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_splitting,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_splitting_pattern,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_sorting,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_selection,
|
||||
VIEWLAYER_PT_freestyle_linestyle_strokes_dashedline,
|
||||
VIEWLAYER_PT_freestyle_linestyle_color,
|
||||
VIEWLAYER_PT_freestyle_linestyle_alpha,
|
||||
VIEWLAYER_PT_freestyle_linestyle_thickness,
|
||||
VIEWLAYER_PT_freestyle_linestyle_geometry,
|
||||
VIEWLAYER_PT_freestyle_linestyle_texture,
|
||||
MATERIAL_PT_freestyle_line,
|
||||
)
|
||||
|
||||
if __name__ == "__main__": # only for live edit.
|
||||
from bpy.utils import register_class
|
||||
|
||||
for cls in classes:
|
||||
register_class(cls)
|
||||
|
||||
@@ -115,10 +115,6 @@ static const string OPTIONS_FILE("options.xml");
|
||||
static const string OPTIONS_CURRENT_DIRS_FILE("current_dirs.xml");
|
||||
static const string OPTIONS_QGLVIEWER_FILE("qglviewer.xml");
|
||||
|
||||
// Default options
|
||||
static const real DEFAULT_SPHERE_RADIUS = 1.0;
|
||||
static const real DEFAULT_DKR_EPSILON = 0.0;
|
||||
|
||||
} // namespace Config
|
||||
|
||||
} /* namespace Freestyle */
|
||||
|
||||
@@ -65,9 +65,6 @@ using namespace Freestyle;
|
||||
|
||||
extern "C" {
|
||||
|
||||
#define DEFAULT_SPHERE_RADIUS 1.0f
|
||||
#define DEFAULT_DKR_EPSILON 0.0f
|
||||
|
||||
struct FreestyleGlobals g_freestyle;
|
||||
|
||||
// Freestyle configuration
|
||||
@@ -433,14 +430,8 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph)
|
||||
}
|
||||
|
||||
// set parameters
|
||||
if (config->flags & FREESTYLE_ADVANCED_OPTIONS_FLAG) {
|
||||
controller->setSphereRadius(config->sphere_radius);
|
||||
controller->setSuggestiveContourKrDerivativeEpsilon(config->dkr_epsilon);
|
||||
}
|
||||
else {
|
||||
controller->setSphereRadius(DEFAULT_SPHERE_RADIUS);
|
||||
controller->setSuggestiveContourKrDerivativeEpsilon(DEFAULT_DKR_EPSILON);
|
||||
}
|
||||
controller->setSphereRadius(config->sphere_radius);
|
||||
controller->setSuggestiveContourKrDerivativeEpsilon(config->dkr_epsilon);
|
||||
controller->setFaceSmoothness((config->flags & FREESTYLE_FACE_SMOOTHNESS_FLAG) ? true : false);
|
||||
controller->setCreaseAngle(RAD2DEGF(config->crease_angle));
|
||||
controller->setVisibilityAlgo((config->flags & FREESTYLE_CULLING) ?
|
||||
|
||||
@@ -40,7 +40,7 @@ enum {
|
||||
FREESTYLE_RIDGES_AND_VALLEYS_FLAG = 1 << 1,
|
||||
FREESTYLE_MATERIAL_BOUNDARIES_FLAG = 1 << 2,
|
||||
FREESTYLE_FACE_SMOOTHNESS_FLAG = 1 << 3,
|
||||
FREESTYLE_ADVANCED_OPTIONS_FLAG = 1 << 4,
|
||||
/* FREESTYLE_ADVANCED_OPTIONS_FLAG = 1 << 4, */ /* UNUSED */
|
||||
FREESTYLE_CULLING = 1 << 5,
|
||||
FREESTYLE_VIEW_MAP_CACHE = 1 << 6,
|
||||
FREESTYLE_AS_RENDER_PASS = 1 << 7,
|
||||
|
||||
@@ -4597,12 +4597,12 @@ void rna_def_freestyle_settings(BlenderRNA *brna)
|
||||
{FREESTYLE_CONTROL_SCRIPT_MODE,
|
||||
"SCRIPT",
|
||||
0,
|
||||
"Python Scripting Mode",
|
||||
"Python Scripting",
|
||||
"Advanced mode for using style modules written in Python"},
|
||||
{FREESTYLE_CONTROL_EDITOR_MODE,
|
||||
"EDITOR",
|
||||
0,
|
||||
"Parameter Editor Mode",
|
||||
"Parameter Editor",
|
||||
"Basic mode for interactive style parameter editing"},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
@@ -4613,7 +4613,7 @@ void rna_def_freestyle_settings(BlenderRNA *brna)
|
||||
{FREESTYLE_QI_RANGE,
|
||||
"RANGE",
|
||||
0,
|
||||
"QI Range",
|
||||
"Quantitative Invisibility",
|
||||
"Select feature edges within a range of quantitative invisibility (QI) values"},
|
||||
{0, NULL, 0, NULL, NULL},
|
||||
};
|
||||
@@ -4930,14 +4930,6 @@ void rna_def_freestyle_settings(BlenderRNA *brna)
|
||||
prop, "Face Smoothness", "Take face smoothness into account in view map calculation");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_freestyle_update");
|
||||
|
||||
prop = RNA_def_property(srna, "use_advanced_options", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_ADVANCED_OPTIONS_FLAG);
|
||||
RNA_def_property_ui_text(
|
||||
prop,
|
||||
"Advanced Options",
|
||||
"Enable advanced edge detection options (sphere radius and Kr derivative epsilon)");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_freestyle_update");
|
||||
|
||||
prop = RNA_def_property(srna, "use_view_map_cache", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_sdna(prop, NULL, "flags", FREESTYLE_VIEW_MAP_CACHE);
|
||||
RNA_def_property_ui_text(
|
||||
@@ -4957,11 +4949,13 @@ void rna_def_freestyle_settings(BlenderRNA *brna)
|
||||
|
||||
prop = RNA_def_property(srna, "sphere_radius", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "sphere_radius");
|
||||
RNA_def_property_float_default(prop, 1.0);
|
||||
RNA_def_property_range(prop, 0.0, 1000.0);
|
||||
RNA_def_property_ui_text(prop, "Sphere Radius", "Sphere radius for computing curvatures");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_freestyle_update");
|
||||
|
||||
prop = RNA_def_property(srna, "kr_derivative_epsilon", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_default(prop, 0.0);
|
||||
RNA_def_property_float_sdna(prop, NULL, "dkr_epsilon");
|
||||
RNA_def_property_range(prop, -1000.0, 1000.0);
|
||||
RNA_def_property_ui_text(
|
||||
|
||||
Reference in New Issue
Block a user