[Bf-blender-cvs] [92104a822d0] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: 92104a822d0d48ba3d13f4e935eed0102e51e52e
Author: YimingWu
Date:   Wed Sep 16 18:19:44 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB92104a822d0d48ba3d13f4e935eed0102e51e52e

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	source/blender/makesdna/DNA_collection_types.h
#	source/blender/makesrna/intern/rna_collection.c

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



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

diff --cc source/blender/makesdna/DNA_collection_types.h
index bfadb18e352,e188426fdda..a5e71fa5fc0
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@@ -67,10 -59,8 +67,10 @@@ typedef struct Collection 
    /* Runtime-only, always cleared on file load. */
    short tag;
  
 +  /** Line Art engine specific */
 +  short lineart_usage;
 +
-   char _pad[2];
+   int16_t color_tag;
 -  char _pad[2];
  
    /* Runtime. Cache of objects in this collection and all its
     * children. This is created on demand when e.g. some physics
diff --cc source/blender/makesrna/intern/rna_collection.c
index 700a8e768e0,b0250897d6d..2e3fe120236
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@@ -478,25 -487,11 +491,31 @@@ void RNA_def_collections(BlenderRNA *br
    RNA_def_property_ui_text(prop, "Disable in Renders", "Globally disable in renders");
    RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_Collection_flag_update");
  
 +  static const EnumPropertyItem rna_collection_lineart_usage[] = {
 +      {COLLECTION_LRT_INCLUDE, "INCLUDE", 0, "Include", "Collection will produce feature lines"},
 +      {COLLECTION_LRT_OCCLUSION_ONLY,
 +       "OCCLUSION_ONLY",
 +       0,
 +       "Occlusion Only",
 +       "Only use the collection to produce occlusion"},
 +      {COLLECTION_LRT_EXCLUDE, "EXCLUDE", 0, "Exclude", "Don't use this collection in LRT"},
 +      {COLLECTION_LRT_INTERSECTION_ONLY,
 +       "INTERSECTION_ONLY",
 +       0,
 +       "Intersection Only",
 +       "Only generate intersection lines with this collection"},
 +      {0, NULL, 0, NULL, NULL}};
 +
 +  prop = RNA_def_property(srna, "lineart_usage", PROP_ENUM, PROP_NONE);
 +  RNA_def_property_enum_items(prop, rna_collection_lineart_usage);
 +  RNA_def_property_ui_text(prop, "Usage", "How to use this collection in LRT");
 +  RNA_def_property_update(prop, NC_SCENE, NULL);
++  
+   prop = RNA_def_property(srna, "color_tag", PROP_ENUM, PROP_NONE);
+   RNA_def_property_enum_sdna(prop, NULL, "color_tag");
+   RNA_def_property_enum_items(prop, rna_enum_collection_color_items);
+   RNA_def_property_ui_text(prop, "Collection Color", "Color tag for a collection");
+   RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, NULL);
  
    RNA_define_lib_overridable(false);
  }