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

[YimingWu]

Commit: 1d8fdfe121ccd535fde6cfc9dc59f2c4ea0316ce
Author: YimingWu
Date:   Sat Sep 11 13:08:49 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB1d8fdfe121ccd535fde6cfc9dc59f2c4ea0316ce

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

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



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

diff --cc source/blender/editors/animation/keyframes_keylist.cc
index 20ffb7b6eeb,c1a18196a3a..97a1ac3d4cd
--- a/source/blender/editors/animation/keyframes_keylist.cc
+++ b/source/blender/editors/animation/keyframes_keylist.cc
@@@ -790,12 -1026,14 +1026,12 @@@ void fcurve_to_keylist(AnimData *adt, F
      for (int v = 0; v < fcu->totvert; v++) {
        chain.cur = &fcu->bezt[v];
  
-       /* Neighbor keys, accounting for being cyclic. */
+       /* Neighbor columns, accounting for being cyclic. */
        if (do_extremes) {
 -        chain.prev = (v > 0)   ? &fcu->bezt[v - 1] :
 -                     is_cyclic ? &fcu->bezt[fcu->totvert - 2] :
 -                                 nullptr;
 +        chain.prev = (v > 0) ? &fcu->bezt[v - 1] :
 +                               is_cyclic ? &fcu->bezt[fcu->totvert - 2] : nullptr;
          chain.next = (v + 1 < fcu->totvert) ? &fcu->bezt[v + 1] :
 -                     is_cyclic              ? &fcu->bezt[1] :
 -                                              nullptr;
 +                                              is_cyclic ? &fcu->bezt[1] : nullptr;
        }
  
        add_bezt_to_keycolumns_list(keylist, &chain);
diff --cc source/blender/makesrna/intern/rna_gpencil_modifier.c
index a2faac99dbb,55fe74cab4f..54309afdb18
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@@ -2902,15 -2902,10 +2902,16 @@@ static void rna_def_modifier_gpencillin
    RNA_def_struct_ui_text(
        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_def_struct_ui_icon(srna, ICON_MOD_LINEART);
+ 
    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, 0, "rna_GpencilModifier_dependency_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,