[Bf-blender-cvs] [abe3c18cf62] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: abe3c18cf620c77f0fe1efb713328036033567cd
Author: Jacques Lucke
Date:   Tue Nov 26 10:40:54 2019 +0100
Branches: functions
https://developer.blender.org/rBabe3c18cf620c77f0fe1efb713328036033567cd

Merge branch 'master' into functions

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



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

diff --cc source/creator/CMakeLists.txt
index 1cd86d9b4b1,53e84de7652..1cea41dc2c6
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@@ -39,13 -38,10 +39,12 @@@ blender_include_dirs
  )
  
  set(LIB
-   bf_blenloader
    bf_blenkernel
-   bf_blenlib
+   bf_blenloader
    bf_depsgraph
    bf_dna
 +  bf_editor_datafiles
 +  bf_functions
    bf_imbuf
    bf_intern_clog
    bf_intern_guardedalloc