diff options
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 92b2621d211..34142709c18 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -28,13 +28,17 @@ #include "BLI_blenlib.h" #include "BLI_math_vector.h" +#include "BLT_translation.h" + #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_deform.h" #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" @@ -42,10 +46,17 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_modifier.h" +#include "BKE_screen.h" #include "DEG_depsgraph.h" +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "MOD_gpencil_modifiertypes.h" +#include "MOD_gpencil_ui_common.h" #include "MOD_gpencil_util.h" static void initData(GpencilModifierData *md) @@ -180,6 +191,7 @@ static void bakeModifier(Main *UNUSED(bmain), } } } + static void freeData(GpencilModifierData *md) { OpacityGpencilModifierData *gpmd = (OpacityGpencilModifierData *)md; @@ -196,6 +208,79 @@ static void foreachIDLink(GpencilModifierData *md, Object *ob, IDWalkFunc walk, walk(userData, ob, (ID **)&mmd->material, IDWALK_CB_USER); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + + uiLayoutSetPropSep(layout, true); + + int modify_color = RNA_enum_get(&ptr, "modify_color"); + + uiItemR(layout, &ptr, "modify_color", 0, NULL, ICON_NONE); + + if (modify_color == GP_MODIFY_COLOR_HARDNESS) { + uiItemR(layout, &ptr, "hardness", 0, NULL, ICON_NONE); + } + else { + uiItemR(layout, &ptr, "normalize_opacity", 0, NULL, ICON_NONE); + const char *text = (RNA_boolean_get(&ptr, "normalize_opacity")) ? IFACE_("Strength") : + IFACE_("Opacity Factor"); + uiItemR(layout, &ptr, "hardness", 0, text, ICON_NONE); + } + + gpencil_modifier_panel_end(layout, &ptr); +} + +static void mask_panel_draw(const bContext *C, Panel *panel) +{ + PointerRNA ptr; + gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + + int modify_color = RNA_enum_get(&ptr, "modify_color"); + bool show_vertex = (modify_color != GP_MODIFY_COLOR_HARDNESS); + + gpencil_modifier_masking_panel_draw(C, panel, true, show_vertex); +} + +static void curve_header_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + + int modify_color = RNA_enum_get(&ptr, "modify_color"); + uiLayoutSetActive(layout, modify_color != GP_MODIFY_COLOR_HARDNESS); + + gpencil_modifier_curve_header_draw(C, panel); +} + +static void curve_panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + gpencil_modifier_panel_get_property_pointers(C, panel, NULL, &ptr); + + int modify_color = RNA_enum_get(&ptr, "modify_color"); + uiLayoutSetActive(layout, modify_color != GP_MODIFY_COLOR_HARDNESS); + + gpencil_modifier_curve_panel_draw(C, panel); +} + +static void panelRegister(ARegionType *region_type) +{ + PanelType *panel_type = gpencil_modifier_panel_register( + region_type, eGpencilModifierType_Opacity, panel_draw); + PanelType *mask_panel_type = gpencil_modifier_subpanel_register( + region_type, "mask", "Influence", NULL, mask_panel_draw, panel_type); + gpencil_modifier_subpanel_register( + region_type, "curve", "", curve_header_draw, curve_panel_draw, mask_panel_type); +} + GpencilModifierTypeInfo modifierType_Gpencil_Opacity = { /* name */ "Opacity", /* structName */ "OpacityGpencilModifierData", @@ -218,4 +303,5 @@ GpencilModifierTypeInfo modifierType_Gpencil_Opacity = { /* foreachObjectLink */ NULL, /* foreachIDLink */ foreachIDLink, /* foreachTexLink */ NULL, + /* panelRegister */ panelRegister, }; |