Commit: 4cd9b51a967f03abc61796cd272434ee7bf6c999
Author: YimingWu
Date: Sun Aug 11 10:17:31 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB4cd9b51a967f03abc61796cd272434ee7bf6c999
Merge remote-tracking branch 'origin/master' into soc-2019-npr
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_material.c
index 86392ceffce,6378ee15279..81aaa20eb6d
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@@ -728,14 -610,14 +728,19 @@@ static void rna_def_material_greasepenc
prop = RNA_def_property(srna, "use_fill_pattern", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STYLE_FILL_PATTERN);
RNA_def_property_ui_text(prop, "Pattern", "Use Fill Texture as a pattern to
apply color");
+
RNA_def_property_update(prop, NC_GPENCIL | ND_SHADING,
"rna_MaterialGpencil_update");
+ prop = RNA_def_property(srna, "use_overlap_strokes", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STYLE_DISABLE_STENCIL);
+ RNA_def_property_ui_text(
+ prop, "Self Overlap", "Disable stencil and overlap self intersections
with alpha materials");
+ prop = RNA_def_property(srna, "use_overlap_strokes", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STYLE_DISABLE_STENCIL);
+ RNA_def_property_ui_text(
+ 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, "show_stroke", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_STYLE_STROKE_SHOW);
RNA_def_property_ui_text(prop, "Show Stroke", "Show stroke lines of this
material");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
