diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-09-12 17:12:19 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-09-12 17:21:34 +0300 |
commit | 78496331f5024de9930e0dfb584f2e43a76e9613 (patch) | |
tree | f1740a97cf663815e291139affb328f22b5f27cd /release/scripts | |
parent | c40171c60d90fc9354b4b7d48a9f8cdf11c5ab06 (diff) |
GPencil: Fix missing Simplify panel in Cycles
Differential Revision: https://developer.blender.org/D5776
Diffstat (limited to 'release/scripts')
-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 |
2 files changed, 29 insertions, 26 deletions
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, |