[Bf-blender-cvs] [46dc226b23d] lanpr-under-gp: Merge branch 'master' into lanpr-under-gp

[Antonio Vazquez]

Commit: 46dc226b23dc58f1dbfaa516106874e8af7b05e3
Author: Antonio Vazquez
Date:   Fri Sep 11 17:06:04 2020 +0200
Branches: lanpr-under-gp
https://developer.blender.org/rB46dc226b23dc58f1dbfaa516106874e8af7b05e3

Merge branch 'master' into lanpr-under-gp

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

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index dd8770180f0,b3e937a29b2..db9a14eb9be
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -106,29 -104,13 +104,18 @@@
  #include "DNA_fileglobal_types.h"
  #include "DNA_fluid_types.h"
  #include "DNA_genfile.h"
- #include "DNA_gpencil_modifier_types.h"
- #include "DNA_gpencil_types.h"
- #include "DNA_hair_types.h"
- #include "DNA_key_types.h"
- #include "DNA_lattice_types.h"
- #include "DNA_layer_types.h"
- #include "DNA_light_types.h"
  #include "DNA_lightprobe_types.h"
 +#include "DNA_lineart_types.h"
 +#include "DNA_linestyle_types.h"
 +#include "DNA_mask_types.h"
 +#include "DNA_material_types.h"
 +#include "DNA_mesh_types.h"
  #include "DNA_meshdata_types.h"
- #include "DNA_meta_types.h"
  #include "DNA_movieclip_types.h"
- #include "DNA_node_types.h"
  #include "DNA_object_force_types.h"
  #include "DNA_object_types.h"
- #include "DNA_packedFile_types.h"
  #include "DNA_particle_types.h"
  #include "DNA_pointcache_types.h"
- #include "DNA_pointcloud_types.h"
  #include "DNA_rigidbody_types.h"
  #include "DNA_scene_types.h"
  #include "DNA_screen_types.h"