[Bf-blender-cvs] [e1041b176a2] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: e1041b176a2b5d812c71f3cf72f68e8e6ee08b78
Author: YimingWu
Date:   Thu Jun 10 20:27:55 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBe1041b176a2b5d812c71f3cf72f68e8e6ee08b78

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/makesrna/intern/rna_gpencil_modifier.c
index f2f1469c511,92d65961743..2953defafe9
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@@ -2701,13 -2750,9 +2750,14 @@@ static void rna_def_modifier_gpencillin
        srna, "Line Art Modifier", "Generate line art strokes from selected source");
    RNA_def_struct_sdna(srna, "LineartGpencilModifierData");
    RNA_def_struct_ui_icon(srna, ICON_MOD_EDGESPLIT);
 -
+   RNA_define_lib_overridable(true);
  
 +  prop = RNA_def_property(srna, "use_custom_camera", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "calculation_flags", LRT_USE_CUSTOM_CAMERA);
 +  RNA_def_property_ui_text(
 +      prop, "Use Custom Camera", "Use custom camera instead of the active camera");
 +  RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update");
 +
    prop = RNA_def_property(srna, "use_fuzzy_intersections", PROP_BOOLEAN, PROP_NONE);
    RNA_def_property_boolean_sdna(prop, NULL, "calculation_flags", LRT_INTERSECTION_AS_CONTOUR);
    RNA_def_property_ui_text(prop,
@@@ -3007,27 -2956,11 +3054,29 @@@
  
    prop = RNA_def_property(srna, "use_transparency_mask", PROP_BOOLEAN, PROP_NONE);
    RNA_def_property_boolean_sdna(prop, NULL, "transparency_mask", 1);
 +  RNA_def_property_array(prop, 6);
 +  RNA_def_property_ui_text(prop, "Masks", "");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 +
 +  prop = RNA_def_property(srna, "use_intersection_filter", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "mask_switches", LRT_GPENCIL_INTERSECTION_FILTER);
 +  RNA_def_property_ui_text(
 +      prop, "Flter Intersection", "Filter intersection lines using mask bits");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 +
 +  prop = RNA_def_property(srna, "use_intersection_match", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "mask_switches", LRT_GPENCIL_INTERSECTION_MATCH);
 +  RNA_def_property_ui_text(
 +      prop, "Match Intersection", "Require matching all intersection masks instead of just one");
 +  RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 +
 +  prop = RNA_def_property(srna, "use_intersection_mask", PROP_BOOLEAN, PROP_NONE);
 +  RNA_def_property_boolean_sdna(prop, NULL, "intersection_mask", 1);
    RNA_def_property_array(prop, 8);
 -  RNA_def_property_ui_text(prop, "Mask", "");
 +  RNA_def_property_ui_text(prop, "Masks", "");
    RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+ 
+   RNA_define_lib_overridable(false);
  }
  
  static void rna_def_modifier_gpencillength(BlenderRNA *brna)