[Bf-blender-cvs] [87507df705f] asset-metadata: Merge branch 'master' into asset-metadata

[Julian Eisel]

Commit: 87507df705ff5d00a53e4060879f5092ad1e447e
Author: Julian Eisel
Date:   Thu Nov 12 23:37:22 2020 +0100
Branches: asset-metadata
https://developer.blender.org/rB87507df705ff5d00a53e4060879f5092ad1e447e

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 32f51d260a8,2c10dd446f1..6c6a8f85b96
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -44,60 -44,17 +44,20 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "DNA_anim_types.h"
 +#include "DNA_armature_types.h"
 +#include "DNA_asset_types.h"
 +#include "DNA_brush_types.h"
  #include "DNA_cachefile_types.h"
- #include "DNA_camera_types.h"
- #include "DNA_cloth_types.h"
- #include "DNA_collection_types.h"
- #include "DNA_constraint_types.h"
- #include "DNA_curveprofile_types.h"
- #include "DNA_dynamicpaint_types.h"
- #include "DNA_effect_types.h"
  #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_ipo_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_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_nla_types.h"
  #include "DNA_node_types.h"
- #include "DNA_object_fluidsim_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"
  #include "DNA_sdna_types.h"
- #include "DNA_sequence_types.h"
- #include "DNA_shader_fx_types.h"
- #include "DNA_simulation_types.h"
  #include "DNA_sound_types.h"
- #include "DNA_space_types.h"
- #include "DNA_speaker_types.h"
- #include "DNA_text_types.h"
- #include "DNA_vfont_types.h"
- #include "DNA_view3d_types.h"
  #include "DNA_volume_types.h"
  #include "DNA_workspace_types.h"
- #include "DNA_world_types.h"
  
  #include "MEM_guardedalloc.h"
  
@@@ -112,30 -69,12 +72,15 @@@
  
  #include "BLT_translation.h"
  
- #include "BKE_action.h"
  #include "BKE_anim_data.h"
  #include "BKE_animsys.h"
 +#include "BKE_armature.h"
 +#include "BKE_asset.h"
 +#include "BKE_brush.h"
  #include "BKE_collection.h"
- #include "BKE_colortools.h"
- #include "BKE_constraint.h"
- #include "BKE_curve.h"
- #include "BKE_curveprofile.h"
- #include "BKE_deform.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.h"
- #include "BKE_gpencil_modifier.h"
- #include "BKE_hair.h"
- #include "BKE_icons.h"
  #include "BKE_idprop.h"
  #include "BKE_idtype.h"
- #include "BKE_image.h"
  #include "BKE_layer.h"
  #include "BKE_lib_id.h"
  #include "BKE_lib_override.h"
diff --cc source/blender/blenloader/intern/writefile.c
index 14c158e5ba2,11fe240620a..a28072ba4d4
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -93,35 -93,9 +93,10 @@@
  /* allow writefile to use deprecated functionality (for forward compatibility code) */
  #define DNA_DEPRECATED_ALLOW
  
- #include "DNA_anim_types.h"
- #include "DNA_armature_types.h"
 +#include "DNA_asset_types.h"
- #include "DNA_cachefile_types.h"
- #include "DNA_cloth_types.h"
- #include "DNA_collection_types.h"
- #include "DNA_constraint_types.h"
- #include "DNA_curveprofile_types.h"
- #include "DNA_dynamicpaint_types.h"
  #include "DNA_fileglobal_types.h"
- #include "DNA_fluid_types.h"
  #include "DNA_genfile.h"
- #include "DNA_lightprobe_types.h"
- #include "DNA_meshdata_types.h"
- #include "DNA_movieclip_types.h"
- #include "DNA_object_force_types.h"
- #include "DNA_object_types.h"
- #include "DNA_particle_types.h"
- #include "DNA_pointcache_types.h"
- #include "DNA_rigidbody_types.h"
- #include "DNA_scene_types.h"
- #include "DNA_screen_types.h"
  #include "DNA_sdna_types.h"
- #include "DNA_sequence_types.h"
- #include "DNA_shader_fx_types.h"
- #include "DNA_space_types.h"
- #include "DNA_view3d_types.h"
- #include "DNA_windowmanager_types.h"
- #include "DNA_workspace_types.h"
  
  #include "BLI_bitmap.h"
  #include "BLI_blenlib.h"