[Bf-blender-cvs] [13dd8b69f03] master: GP: Rename "Dualtone" to "Duotone"

[Antonioya]

Commit: 13dd8b69f036980b7ad14b692ad5c1edb11745d0
Author: Antonioya
Date:   Tue Feb 26 10:15:13 2019 +0100
Branches: master
https://developer.blender.org/rB13dd8b69f036980b7ad14b692ad5c1edb11745d0

GP: Rename "Dualtone" to "Duotone"

===================================================================

M       
source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl
M       source/blender/makesdna/DNA_shader_fx_types.h
M       source/blender/makesrna/intern/rna_shader_fx.c

===================================================================

diff --git 
a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl 
b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl
index e7b38d092af..fb44b18cc86 100644
--- 
a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl
+++ 
b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_colorize_frag.glsl
@@ -10,7 +10,7 @@ out vec4 FragColor;
 
 #define MODE_GRAYSCALE   0
 #define MODE_SEPIA       1
-#define MODE_DUALTONE    2
+#define MODE_DUOTONE    2
 #define MODE_CUSTOM      3
 #define MODE_TRANSPARENT 4
 
@@ -48,7 +48,7 @@ void main()
                        outcolor = vec4(Red, Green, Blue, src_pixel.a);
                        break;
                        }
-               case MODE_DUALTONE:
+               case MODE_DUOTONE:
                        {
                        if (luminance <= factor) {
                                outcolor = low_color;
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h 
b/source/blender/makesdna/DNA_shader_fx_types.h
index 96b114dd365..342c2be9d17 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -115,7 +115,7 @@ typedef struct ColorizeShaderFxData {
 typedef enum ColorizeShaderFxModes {
        eShaderFxColorizeMode_GrayScale = 0,
        eShaderFxColorizeMode_Sepia = 1,
-       eShaderFxColorizeMode_DualTone = 2,
+       eShaderFxColorizeMode_Duotone = 2,
        eShaderFxColorizeMode_Custom = 3,
        eShaderFxColorizeMode_Transparent = 4,
 } ColorizeShaderFxModes;
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c 
b/source/blender/makesrna/intern/rna_shader_fx.c
index 2f0a4a4be7d..78a21b71fbf 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -77,7 +77,7 @@ static const EnumPropertyItem 
rna_enum_shaderfx_glow_modes_items[] = {
 static const EnumPropertyItem rna_enum_shaderfx_colorize_modes_items[] = {
        {eShaderFxColorizeMode_GrayScale, "GRAYSCALE", 0, "Gray Scale", "" },
        {eShaderFxColorizeMode_Sepia, "SEPIA", 0, "Sepia", "" },
-       {eShaderFxColorizeMode_DualTone, "DUALTONE", 0, "Dualtone", "" },
+       {eShaderFxColorizeMode_Duotone, "DUOTONE", 0, "Duotone", "" },
        {eShaderFxColorizeMode_Transparent, "TRANSPARENT", 0, "Transparent", "" 
},
        {eShaderFxColorizeMode_Custom, "CUSTOM", 0, "Custom", "" },
        {0, NULL, 0, NULL, NULL }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs