[Bf-blender-cvs] [67da49df4de] asset-metadata: Merge branch 'master' into asset-metadata

[Julian Eisel]

Commit: 67da49df4dea1d55e65b72253d5caa356e4d161e
Author: Julian Eisel
Date:   Thu Sep 17 12:50:37 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rB67da49df4dea1d55e65b72253d5caa356e4d161e

Merge branch 'master' into asset-metadata

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index 56e8f2a2ccd,8dc661e6c85..a57387ed169
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -95,10 -95,7 +95,8 @@@
  
  #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"