[Bf-blender-cvs] [ef817015d1f] blenloader-decentralization: Merge branch 'master' into blenloader-decentralization

[Jacques Lucke]

Commit: ef817015d1f7f55c5a8bc00235e7ad256b97c066
Author: Jacques Lucke
Date:   Sun May 3 14:42:06 2020 +0200
Branches: blenloader-decentralization
https://developer.blender.org/rBef817015d1f7f55c5a8bc00235e7ad256b97c066

Merge branch 'master' into blenloader-decentralization

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



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

diff --cc source/blender/blenkernel/intern/fcurve.c
index 2e821f76ed4,3f55831cfeb..5d93b061b5d
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@@ -50,24 -41,14 +41,16 @@@
  #include "BKE_context.h"
  #include "BKE_curve.h"
  #include "BKE_fcurve.h"
+ #include "BKE_fcurve_driver.h"
  #include "BKE_global.h"
  #include "BKE_nla.h"
- #include "BKE_object.h"
  
 +#include "BLO_read_write.h"
 +
  #include "RNA_access.h"
  
- #include "atomic_ops.h"
- 
  #include "CLG_log.h"
  
- #ifdef WITH_PYTHON
- #  include "BPY_extern.h"
- #endif
- 
  #define SMALL -1.0e-10
  #define SELECT 1
  
diff --cc source/blender/blenloader/intern/readfile.c
index 730b3642ed5,418750a8df2..34967410cea
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -118,9 -117,8 +118,9 @@@
  #include "BKE_colortools.h"
  #include "BKE_constraint.h"
  #include "BKE_curve.h"
 +#include "BKE_curveprofile.h"
  #include "BKE_effect.h"
- #include "BKE_fcurve.h"
+ #include "BKE_fcurve_driver.h"
  #include "BKE_fluid.h"
  #include "BKE_global.h"  // for G
  #include "BKE_gpencil_modifier.h"
diff --cc source/blender/blenloader/intern/writefile.c
index c2f21c0acfb,3015a0e1b8a..c064087fbaf
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -155,14 -154,12 +155,15 @@@
  #include "BKE_blender_version.h"
  #include "BKE_bpath.h"
  #include "BKE_collection.h"
 +#include "BKE_colortools.h"
  #include "BKE_constraint.h"
  #include "BKE_curve.h"
 +#include "BKE_curveprofile.h"
  #include "BKE_fcurve.h"
+ #include "BKE_fcurve_driver.h"
  #include "BKE_global.h"  // for G
  #include "BKE_gpencil_modifier.h"
 +#include "BKE_idprop.h"
  #include "BKE_idtype.h"
  #include "BKE_layer.h"
  #include "BKE_lib_override.h"