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

[YimingWu]

Commit: f56338490a0957fde9f822cee1ec6fc4166abbd2
Author: YimingWu
Date:   Tue Aug 10 09:41:48 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBf56338490a0957fde9f822cee1ec6fc4166abbd2

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

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



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

diff --cc source/blender/editors/animation/keyframes_keylist.cc
index 98aedb9cd0c,85036efc983..26b1d7bc49d
--- a/source/blender/editors/animation/keyframes_keylist.cc
+++ b/source/blender/editors/animation/keyframes_keylist.cc
@@@ -782,8 -792,12 +792,10 @@@ void fcurve_to_keylist(AnimData *adt, F
  
        /* Neighbor keys, accounting for being cyclic. */
        if (do_extremes) {
-         chain.prev = (v > 0) ? &fcu->bezt[v - 1] : is_cyclic ? &fcu->bezt[fcu->totvert - 2] : NULL;
-         chain.next = (v + 1 < fcu->totvert) ? &fcu->bezt[v + 1] : is_cyclic ? &fcu->bezt[1] : NULL;
 -        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);