diff options
author | Hans Goudey <h.goudey@me.com> | 2020-06-19 22:07:13 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-06-19 22:07:13 +0300 |
commit | bb4cef71eeaf36aa61187d47b8a8ae06ba55f7c0 (patch) | |
tree | 35700820beee851c984c9162d40952387cca5e39 /source/blender/shader_fx/intern/FX_shader_colorize.c | |
parent | 702e00f91088031f83cfed1528d5ed22069a9d35 (diff) |
UI: ShaderFx Drag and Drop, Layout Updates
This patch implements the list panel system D7490 for grease pencil
shader effects. It also moves their drawing to a callback in
ShaderFxTypeInfo in line with the extensible architecture refactoring
goal T75724.
The implementation is basically exactly the same as for the modifier
patch (9b099c86123fc82).
Thanks to Matias Mendiola (@mendio) for helping to develop the layout
changes.
Differential Revision: https://developer.blender.org/D7985
Diffstat (limited to 'source/blender/shader_fx/intern/FX_shader_colorize.c')
-rw-r--r-- | source/blender/shader_fx/intern/FX_shader_colorize.c | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.c b/source/blender/shader_fx/intern/FX_shader_colorize.c index 5fea2cd0ff8..969171332fa 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.c +++ b/source/blender/shader_fx/intern/FX_shader_colorize.c @@ -23,11 +23,23 @@ #include <stdio.h> -#include "DNA_shader_fx_types.h" +#include "BKE_context.h" +#include "BKE_screen.h" #include "BLI_utildefines.h" +#include "BLT_translation.h" + +#include "DNA_screen_types.h" +#include "DNA_shader_fx_types.h" + +#include "UI_interface.h" +#include "UI_resources.h" + +#include "RNA_access.h" + #include "FX_shader_types.h" +#include "FX_ui_common.h" static void initData(ShaderFxData *fx) { @@ -43,6 +55,38 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target) BKE_shaderfx_copydata_generic(md, target); } +static void panel_draw(const bContext *C, Panel *panel) +{ + uiLayout *layout = panel->layout; + + PointerRNA ptr; + shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr); + + int mode = RNA_enum_get(&ptr, "mode"); + + uiLayoutSetPropSep(layout, true); + + uiItemR(layout, &ptr, "mode", 0, NULL, ICON_NONE); + + if (ELEM(mode, eShaderFxColorizeMode_Custom, eShaderFxColorizeMode_Duotone)) { + const char *text = (mode == eShaderFxColorizeMode_Duotone) ? IFACE_("Low Color") : + IFACE_("Color"); + uiItemR(layout, &ptr, "low_color", 0, text, ICON_NONE); + } + if (mode == eShaderFxColorizeMode_Duotone) { + uiItemR(layout, &ptr, "high_color", 0, NULL, ICON_NONE); + } + + uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE); + + shaderfx_panel_end(layout, &ptr); +} + +static void panelRegister(ARegionType *region_type) +{ + shaderfx_panel_register(region_type, eShaderFxType_Colorize, panel_draw); +} + ShaderFxTypeInfo shaderfx_Type_Colorize = { /* name */ "Colorize", /* structName */ "ColorizeShaderFxData", @@ -59,4 +103,5 @@ ShaderFxTypeInfo shaderfx_Type_Colorize = { /* dependsOnTime */ NULL, /* foreachObjectLink */ NULL, /* foreachIDLink */ NULL, + /* panelRegister */ panelRegister, }; |