[Bf-blender-cvs] [d46dfa871de] asset-browser: Merge branch 'master' into tmp-review-asset-metadata

[Julian Eisel]

Commit: d46dfa871de22af9200d43bd8b8546ca118de699
Author: Julian Eisel
Date:   Thu Dec 3 01:45:53 2020 +0100
Branches: asset-browser
https://developer.blender.org/rBd46dfa871de22af9200d43bd8b8546ca118de699

Merge branch 'master' into tmp-review-asset-metadata

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index ae79bf43a55,1a90d6fadd3..a35e6202dc2
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -77,8 -77,8 +77,9 @@@ set(SR
    intern/armature.c
    intern/armature_deform.c
    intern/armature_update.c
 +  intern/asset.c
    intern/attribute.c
+   intern/attribute_access.cc
    intern/autoexec.c
    intern/blender.c
    intern/blender_copybuffer.c
@@@ -267,8 -268,8 +269,9 @@@
    BKE_appdir.h
    BKE_armature.h
    BKE_attribute.h
+   BKE_attribute_access.hh
    BKE_autoexec.h
 +  BKE_asset.h
    BKE_blender.h
    BKE_blender_copybuffer.h
    BKE_blender_undo.h