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

[Jacques Lucke]

Commit: 90529a8d4d778070c4300f8ebe6dd5c5cca5164d
Author: Jacques Lucke
Date:   Tue Dec 3 11:55:39 2019 +0100
Branches: functions
https://developer.blender.org/rB90529a8d4d778070c4300f8ebe6dd5c5cca5164d

Merge branch 'master' into functions

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index e550fb94757,88a3629ea3f..14229bcb016
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -128,8 -128,8 +128,9 @@@ set(SR
    intern/image.c
    intern/image_gen.c
    intern/image_save.c
 +  intern/inlined_node_tree.cc
    intern/ipo.c
+   intern/kelvinlet.c
    intern/key.c
    intern/keyconfig.c
    intern/lattice.c
@@@ -294,8 -292,8 +295,9 @@@
    BKE_idprop.h
    BKE_image.h
    BKE_image_save.h
 +  BKE_inlined_node_tree.h
    BKE_ipo.h
+   BKE_kelvinlet.h
    BKE_key.h
    BKE_keyconfig.h
    BKE_lattice.h
diff --cc tests/gtests/CMakeLists.txt
index a04fddf07da,54a1ee41198..51d573a9b98
--- a/tests/gtests/CMakeLists.txt
+++ b/tests/gtests/CMakeLists.txt
@@@ -13,9 -13,10 +13,10 @@@ if(WITH_GTESTS
  
    add_subdirectory(testing)
    add_subdirectory(blenlib)
+   add_subdirectory(blenloader)
    add_subdirectory(guardedalloc)
 -  add_subdirectory(bmesh)
 -  if(WITH_ALEMBIC)
 -    add_subdirectory(alembic)
 -  endif()
 +  # add_subdirectory(bmesh)
 +  # if(WITH_ALEMBIC)
 +  #   add_subdirectory(alembic)
 +  # endif()
  endif()