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

[YimingWu]

Commit: a5373d4c51f360c32ea9648b201e042bde99e7a4
Author: YimingWu
Date:   Wed Jul 7 13:02:39 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBa5373d4c51f360c32ea9648b201e042bde99e7a4

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

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index ffdbbeff2c1,f16b73f3c7b..f9f175b61fa
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -28,9 -28,8 +28,10 @@@
  #include "DNA_anim_types.h"
  #include "DNA_armature_types.h"
  #include "DNA_brush_types.h"
+ #include "DNA_collection_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_modifier_types.h"
 +#include "DNA_lineart_types.h"
  #include "DNA_listBase.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"