[Bf-blender-cvs] [b0bca6f0889] asset-system-filelist: Merge branch 'master' into asset-system-filelist

[Julian Eisel]

Commit: b0bca6f0889ebf345833b54a352640408e36c6a5
Author: Julian Eisel
Date:   Wed May 19 18:45:53 2021 +0200
Branches: asset-system-filelist
https://developer.blender.org/rBb0bca6f0889ebf345833b54a352640408e36c6a5

Merge branch 'master' into asset-system-filelist

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



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

diff --cc source/blender/editors/armature/CMakeLists.txt
index 9ae58ed5425,0030e78002b..e942bcf2902
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@@ -17,9 -17,9 +17,10 @@@
  
  set(INC
    ../include
+   ../../blenfont
    ../../blenkernel
    ../../blenlib
 +  ../../blenloader
    ../../blentranslation
    ../../depsgraph
    ../../gpu