diff options
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 26 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 29 |
3 files changed, 37 insertions, 26 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9028100ad7a..200b08f93cb 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -22,6 +22,8 @@ from bl_ui.utils import PresetPanel from bpy.types import Panel +from bl_ui.properties_grease_pencil_common import GreasePencilSimplifyPanel + class CYCLES_PT_sampling_presets(PresetPanel, Panel): bl_label = "Sampling Presets" @@ -2108,6 +2110,11 @@ class CYCLES_VIEW3D_PT_shading_lighting(Panel): col.prop(shading, "studiolight_intensity") col.prop(shading, "studiolight_background_alpha") +class CYCLES_VIEW3D_PT_simplify_greasepencil(CyclesButtonsPanel, Panel, GreasePencilSimplifyPanel): + bl_label = "Grease Pencil" + bl_parent_id = "CYCLES_RENDER_PT_simplify" + COMPAT_ENGINES = {'CYCLES'} + bl_options = {'DEFAULT_CLOSED'} def draw_device(self, context): scene = context.scene @@ -2190,6 +2197,7 @@ classes = ( CYCLES_RENDER_PT_simplify_viewport, CYCLES_RENDER_PT_simplify_render, CYCLES_RENDER_PT_simplify_culling, + CYCLES_VIEW3D_PT_simplify_greasepencil, CYCLES_VIEW3D_PT_shading_lighting, CYCLES_VIEW3D_PT_shading_render_pass, CYCLES_RENDER_PT_motion_blur, diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index f3cec24acb4..ca9c518f443 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -950,6 +950,32 @@ class GPENCIL_UL_layer(UIList): icon_value=icon, ) +class GreasePencilSimplifyPanel: + + def draw_header(self, context): + rd = context.scene.render + self.layout.prop(rd, "simplify_gpencil", text="") + + def draw(self, context): + layout = self.layout + layout.use_property_split = True + layout.use_property_decorate = False + + rd = context.scene.render + + layout.active = rd.simplify_gpencil + + col = layout.column() + col.prop(rd, "simplify_gpencil_onplay", text="Playback Only") + col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers") + col.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX") + col.prop(rd, "simplify_gpencil_blend", text="Layers Blending") + col.prop(rd, "simplify_gpencil_tint", text="Layers Tinting") + + col.prop(rd, "simplify_gpencil_view_fill") + sub = col.column() + sub.active = rd.simplify_gpencil_view_fill + sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines") classes = ( GPENCIL_MT_pie_tool_palette, diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 60e55dc4e93..e262406137e 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -25,6 +25,8 @@ from bl_ui.space_view3d import ( VIEW3D_PT_shading_options, ) +from bl_ui.properties_grease_pencil_common import GreasePencilSimplifyPanel + class RenderButtonsPanel: bl_space_type = 'PROPERTIES' @@ -653,37 +655,12 @@ class RENDER_PT_simplify_render(RenderButtonsPanel, Panel): col.prop(rd, "simplify_child_particles_render", text="Max Child Particles") -class RENDER_PT_simplify_greasepencil(RenderButtonsPanel, Panel): +class RENDER_PT_simplify_greasepencil(RenderButtonsPanel, Panel, GreasePencilSimplifyPanel): bl_label = "Grease Pencil" bl_parent_id = "RENDER_PT_simplify" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'BLENDER_CLAY', 'BLENDER_EEVEE'} bl_options = {'DEFAULT_CLOSED'} - def draw_header(self, context): - rd = context.scene.render - self.layout.prop(rd, "simplify_gpencil", text="") - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - layout.use_property_decorate = False - - rd = context.scene.render - - layout.active = rd.simplify_gpencil - - col = layout.column() - col.prop(rd, "simplify_gpencil_onplay", text="Playback Only") - col.prop(rd, "simplify_gpencil_view_modifier", text="Modifiers") - col.prop(rd, "simplify_gpencil_shader_fx", text="ShaderFX") - col.prop(rd, "simplify_gpencil_blend", text="Layers Blending") - col.prop(rd, "simplify_gpencil_tint", text="Layers Tinting") - - col.prop(rd, "simplify_gpencil_view_fill") - sub = col.column() - sub.active = rd.simplify_gpencil_view_fill - sub.prop(rd, "simplify_gpencil_remove_lines", text="Lines") - classes = ( RENDER_PT_context, |