[Bf-blender-cvs] [02fd6dda359] refactor-idprop-ui-data: Merge branch 'master' into refactor-idprop-ui-data

[Hans Goudey]

Commit: 02fd6dda35933c42d3c3694eaa54ed53a3f4973a
Author: Hans Goudey
Date:   Sun Aug 1 09:37:02 2021 -0400
Branches: refactor-idprop-ui-data
https://developer.blender.org/rB02fd6dda35933c42d3c3694eaa54ed53a3f4973a

Merge branch 'master' into refactor-idprop-ui-data

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 3bbf93628e1,9aec18ea279..88cbc90d625
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -40,10 -39,11 +43,12 @@@
  
  #include "BKE_action.h"
  #include "BKE_animsys.h"
+ #include "BKE_asset.h"
  #include "BKE_collection.h"
  #include "BKE_deform.h"
+ #include "BKE_fcurve.h"
  #include "BKE_fcurve_driver.h"
 +#include "BKE_idprop.h"
  #include "BKE_lib_id.h"
  #include "BKE_main.h"
  #include "BKE_node.h"