[Bf-blender-cvs] [1a20b3d42de] temp-asset-browser-catalogs: Merge branch 'master' into temp-asset-browser-catalogs

[Julian Eisel]

Commit: 1a20b3d42de1d289218c7745e2c5cfce231cdcad
Author: Julian Eisel
Date:   Tue Aug 31 16:29:50 2021 +0200
Branches: temp-asset-browser-catalogs
https://developer.blender.org/rB1a20b3d42de1d289218c7745e2c5cfce231cdcad

Merge branch 'master' into temp-asset-browser-catalogs

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index 5bd5f618ca5,64cfbd8f491..51140463eba
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -78,12 -78,10 +78,12 @@@ set(SR
    intern/anim_visualization.c
    intern/appdir.c
    intern/armature.c
-   intern/armature_selection.cc
    intern/armature_deform.c
    intern/armature_pose.cc
+   intern/armature_selection.cc
    intern/armature_update.c
 +  intern/asset_catalog.cc
 +  intern/asset_library.cc
    intern/asset.cc
    intern/attribute.c
    intern/attribute_access.cc