[Bf-blender-cvs] [4f6daa5d302] greasepencil-object: GPencil: Rename Material Masking to Holdout
Antonio Vazquez
noreply at git.blender.org
Fri Sep 11 16:25:44 CEST 2020
Commit: 4f6daa5d3026fa543637fea19b11faf814fb5ad9
Author: Antonio Vazquez
Date: Fri Sep 11 15:55:46 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4f6daa5d3026fa543637fea19b11faf814fb5ad9
GPencil: Rename Material Masking to Holdout
This name follows better the standard naming.
===================================================================
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/gpencil/gpencil_draw_data.c
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
M source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
M source/blender/editors/gpencil/gpencil_trace_utils.c
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesrna/intern/rna_material.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 2042e4be7e5..a1af447d402 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -169,7 +169,7 @@ class MATERIAL_PT_gpencil_strokecolor(GPMaterialButtonsPanel, Panel):
if gpcolor.mode == 'LINE':
col.prop(gpcolor, "use_overlap_strokes")
- col.prop(gpcolor, "use_stroke_masking", text="Holdout")
+ col.prop(gpcolor, "use_stroke_holdout")
class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
@@ -225,7 +225,7 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
col.prop(gpcolor, "texture_scale", text="Scale")
col.prop(gpcolor, "texture_clamp", text="Clip Image")
- col.prop(gpcolor, "use_fill_masking", text="Holdout")
+ col.prop(gpcolor, "use_fill_holdout")
class MATERIAL_PT_gpencil_preview(GPMaterialButtonsPanel, Panel):
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 2c56cf70084..8be21992f22 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -62,8 +62,8 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob)
tgp_ob->do_mat_masking = false;
for (int i = 0; i < ob->totcol; i++) {
MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, i + 1);
- if ((gp_style->flag & GP_MATERIAL_IS_STROKE_MASK) ||
- ((gp_style->flag & GP_MATERIAL_IS_FILL_MASK))) {
+ if ((gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT) ||
+ ((gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT))) {
tgp_ob->do_mat_masking = true;
break;
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
index ce85b21a04a..aa12c47e510 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
@@ -238,11 +238,11 @@ GPENCIL_MaterialPool *gpencil_material_pool_create(GPENCIL_PrivateData *pd, Obje
}
/* Material with masking. */
- if (gp_style->flag & GP_MATERIAL_IS_STROKE_MASK) {
- mat_data->flag |= GP_STROKE_MASK;
+ if (gp_style->flag & GP_MATERIAL_IS_STROKE_HOLDOUT) {
+ mat_data->flag |= GP_STROKE_HOLDOUT;
}
- if (gp_style->flag & GP_MATERIAL_IS_FILL_MASK) {
- mat_data->flag |= GP_FILL_MASK;
+ if (gp_style->flag & GP_MATERIAL_IS_FILL_HOLDOUT) {
+ mat_data->flag |= GP_FILL_HOLDOUT;
}
gp_style = gpencil_viewport_material_overrides(pd, ob, color_type, gp_style);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 335a5fc114d..f5fc204bf1b 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -80,8 +80,8 @@ typedef struct gpMaterial {
#define GP_STROKE_TEXTURE_STENCIL (1 << 4)
#define GP_STROKE_TEXTURE_PREMUL (1 << 5)
#define GP_STROKE_DOTS (1 << 6)
-#define GP_STROKE_MASK (1 << 7)
-#define GP_FILL_MASK (1 << 8)
+#define GP_STROKE_HOLDOUT (1 << 7)
+#define GP_FILL_HOLDOUT (1 << 8)
#define GP_FILL_TEXTURE_USE (1 << 10)
#define GP_FILL_TEXTURE_PREMUL (1 << 11)
#define GP_FILL_TEXTURE_CLIP (1 << 12)
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
index 4630595415d..2abff2b5577 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -24,8 +24,8 @@ struct gpMaterial {
#define GP_STROKE_TEXTURE_STENCIL (1 << 4)
#define GP_STROKE_TEXTURE_PREMUL (1 << 5)
#define GP_STROKE_DOTS (1 << 6)
-#define GP_STROKE_MASK (1 << 7)
-#define GP_FILL_MASK (1 << 8)
+#define GP_STROKE_HOLDOUT (1 << 7)
+#define GP_FILL_HOLDOUT (1 << 8)
#define GP_FILL_TEXTURE_USE (1 << 10)
#define GP_FILL_TEXTURE_PREMUL (1 << 11)
#define GP_FILL_TEXTURE_CLIP (1 << 12)
@@ -36,7 +36,7 @@ struct gpMaterial {
/* Multiline defines can crash blender with certain GPU drivers. */
/* clang-format off */
-#define GP_FILL_FLAGS (GP_FILL_TEXTURE_USE | GP_FILL_TEXTURE_PREMUL | GP_FILL_TEXTURE_CLIP | GP_FILL_GRADIENT_USE | GP_FILL_GRADIENT_RADIAL | GP_FILL_MASK)
+#define GP_FILL_FLAGS (GP_FILL_TEXTURE_USE | GP_FILL_TEXTURE_PREMUL | GP_FILL_TEXTURE_CLIP | GP_FILL_GRADIENT_USE | GP_FILL_GRADIENT_RADIAL | GP_FILL_HOLDOUT)
/* clang-format on */
#define GP_FLAG_TEST(flag, val) (((flag) & (val)) != 0)
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
index e946edcc99f..b7156ccc8d9 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
@@ -90,7 +90,7 @@ void main()
strokePt1, strokePt2, strokeAspect, strokeThickness, strokeHardeness);
/* Masking materials. */
- if (GP_FLAG_TEST(matFlag, GP_STROKE_MASK | GP_FILL_MASK)) {
+ if (GP_FLAG_TEST(matFlag, GP_STROKE_HOLDOUT | GP_FILL_HOLDOUT)) {
revealColor = vec4(1.0 - fragColor.aaa, 1.0);
fragColor = vec4(fragColor.rgb, 1.0);
}
diff --git a/source/blender/editors/gpencil/gpencil_trace_utils.c b/source/blender/editors/gpencil/gpencil_trace_utils.c
index fe28d21acd3..aa5fd42fa6c 100644
--- a/source/blender/editors/gpencil/gpencil_trace_utils.c
+++ b/source/blender/editors/gpencil/gpencil_trace_utils.c
@@ -280,8 +280,8 @@ void ED_gpencil_trace_data_to_strokes(Main *bmain,
gp_style->fill_rgba[3] = 0.0f;
gp_style->flag |= GP_MATERIAL_STROKE_SHOW;
gp_style->flag |= GP_MATERIAL_FILL_SHOW;
- gp_style->flag |= GP_MATERIAL_IS_STROKE_MASK;
- gp_style->flag |= GP_MATERIAL_IS_FILL_MASK;
+ gp_style->flag |= GP_MATERIAL_IS_STROKE_HOLDOUT;
+ gp_style->flag |= GP_MATERIAL_IS_FILL_HOLDOUT;
mat_mask_idx = ob->totcol - 1;
}
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 4150bf17dd9..355d3d6439b 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -129,9 +129,9 @@ typedef enum eMaterialGPencilStyle_Flag {
/* disable stencil clipping (overlap) */
GP_MATERIAL_DISABLE_STENCIL = (1 << 12),
/* Material used as stroke masking. */
- GP_MATERIAL_IS_STROKE_MASK = (1 << 13),
+ GP_MATERIAL_IS_STROKE_HOLDOUT = (1 << 13),
/* Material used as fill masking. */
- GP_MATERIAL_IS_FILL_MASK = (1 << 14),
+ GP_MATERIAL_IS_FILL_HOLDOUT = (1 << 14),
} eMaterialGPencilStyle_Flag;
typedef enum eMaterialGPencilStyle_Mode {
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 06a3bb3454e..955f2c7b449 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -564,14 +564,14 @@ static void rna_def_material_greasepencil(BlenderRNA *brna)
prop, "Self Overlap", "Disable stencil and overlap self intersections with alpha materials");
RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_MaterialGpencil_update");
- prop = RNA_def_property(srna, "use_stroke_masking", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_IS_STROKE_MASK);
- RNA_def_property_ui_text(prop, "Mask", "Use the material as a transparent mask");
+ prop = RNA_def_property(srna, "use_stroke_holdout", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_IS_STROKE_HOLDOUT);
+ RNA_def_property_ui_text(prop, "Holdout", "Use the material as a transparent mask");
RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_MaterialGpencil_update");
- prop = RNA_def_property(srna, "use_fill_masking", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_IS_FILL_MASK);
- RNA_def_property_ui_text(prop, "Mask", "Use the material as a transparent mask");
+ prop = RNA_def_property(srna, "use_fill_holdout", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_MATERIAL_IS_FILL_HOLDOUT);
+ RNA_def_property_ui_text(prop, "Holdout", "Use the material as a transparent mask");
RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING, "rna_MaterialGpencil_update");
prop = RNA_def_property(srna, "show_stroke", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list