[Bf-blender-cvs] [edf1b833674] temp-gpencil-masking: Merge branch 'master' into temp-gpencil-masking

[Antonio Vazquez]

Commit: edf1b833674a6e54df7a16c14f0c6193fbbb482e
Author: Antonio Vazquez
Date:   Thu Apr 22 16:37:10 2021 +0200
Branches: temp-gpencil-masking
https://developer.blender.org/rBedf1b833674a6e54df7a16c14f0c6193fbbb482e

Merge branch 'master' into temp-gpencil-masking

 Conflicts:
	source/blender/blenloader/intern/versioning_300.c

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 95cbb1afa5d,6b13b21f057..e52067a03b3
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -20,8 -20,12 +20,14 @@@
  /* allow readfile to use deprecated functionality */
  #define DNA_DEPRECATED_ALLOW
  
+ #include "BLI_listbase.h"
+ #include "BLI_utildefines.h"
+ 
+ #include "DNA_genfile.h"
+ #include "DNA_modifier_types.h"
+ 
 +#include "DNA_gpencil_types.h"
 +
  #include "BKE_main.h"
  
  #include "BLO_readfile.h"