[Bf-blender-cvs] [0aca44f6559] asset-browser: Merge branch 'master' into asset-browser

[Julian Eisel]

Commit: 0aca44f6559c92683f1621e197b875b4a4cc6a93
Author: Julian Eisel
Date:   Thu Dec 3 01:58:07 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB0aca44f6559c92683f1621e197b875b4a4cc6a93

Merge branch 'master' into asset-browser

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 3e8422397b4,1a90d6fadd3..defa812cf5c
--- 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
@@@ -268,8 -268,8 +270,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