[Bf-blender-cvs] [bb3d0e49042] fcurve-modifier-panels: Merge branch 'master' into fcurve-modifier-panels

[Hans Goudey]

Commit: bb3d0e49042c7bf5dbfb4dfa782de71edd441845
Author: Hans Goudey
Date:   Wed Aug 12 10:27:24 2020 -0400
Branches: fcurve-modifier-panels
https://developer.blender.org/rBbb3d0e49042c7bf5dbfb4dfa782de71edd441845

Merge branch 'master' into fcurve-modifier-panels

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



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

diff --cc source/blender/blenkernel/BKE_fcurve.h
index bb31014308e,3717eb0f282..349deb62b96
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@@ -36,7 -35,7 +35,8 @@@ struct FCurve
  struct FModifier;
  
  struct AnimData;
 +struct ARegionType;
+ struct AnimationEvalContext;
  struct BezTriple;
  struct LibraryForeachIDData;
  struct PathResolvedRNA;