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

[Jacques Lucke]

Commit: 8471b2f22e9273e62797777c2a509aba5a8f86aa
Author: Jacques Lucke
Date:   Thu Mar 5 11:41:38 2020 +0100
Branches: functions
https://developer.blender.org/rB8471b2f22e9273e62797777c2a509aba5a8f86aa

Merge branch 'master' into functions

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index fb2b25c03c7,87ac82aaa55..5d59de0b803
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -126,8 -125,7 +126,9 @@@ set(SR
    intern/idcode.c
    intern/idprop.c
    intern/idprop_utils.c
 +  intern/id_data_cache.cc
 +  intern/id_handle.cc
+   intern/idtype.c
    intern/image.c
    intern/image_gen.c
    intern/image_save.c
@@@ -297,8 -293,7 +298,9 @@@
    BKE_icons.h
    BKE_idcode.h
    BKE_idprop.h
 +  BKE_id_data_cache.h
 +  BKE_id_handle.h
+   BKE_idtype.h
    BKE_image.h
    BKE_image_save.h
    BKE_ipo.h
diff --cc tests/gtests/blenlib/CMakeLists.txt
index cf36225dca8,119b54fa0d4..b7bf8d3c7cc
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -58,9 -58,8 +58,10 @@@ BLENDER_TEST(BLI_map "bf_blenlib"
  BLENDER_TEST(BLI_math_base "bf_blenlib")
  BLENDER_TEST(BLI_math_color "bf_blenlib")
  BLENDER_TEST(BLI_math_geom "bf_blenlib")
+ BLENDER_TEST(BLI_math_vector "bf_blenlib")
  BLENDER_TEST(BLI_memiter "bf_blenlib")
 +BLENDER_TEST(BLI_linear_allocator "bf_blenlib")
 +BLENDER_TEST(BLI_multi_map "bf_blenlib")
  BLENDER_TEST(BLI_optional "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")