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

[Jacques Lucke]

Commit: 00d456761f93e55d67783e47109873189568690d
Author: Jacques Lucke
Date:   Mon Aug 12 09:23:25 2019 +0200
Branches: functions
https://developer.blender.org/rB00d456761f93e55d67783e47109873189568690d

Merge branch 'master' into functions

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



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

diff --cc tests/gtests/blenlib/CMakeLists.txt
index 4c8a5be40f9,4e5811d140e..16e0601faab
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -38,12 -38,9 +38,13 @@@ else(
    set(BLI_path_util_extra_libs "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
  endif()
  
 +BLENDER_TEST(BLI_array_allocator "bf_blenlib")
 +BLENDER_TEST(BLI_array_lookup "bf_blenlib")
  BLENDER_TEST(BLI_array_store "bf_blenlib")
  BLENDER_TEST(BLI_array_utils "bf_blenlib")
 +BLENDER_TEST(BLI_array_ref "bf_blenlib")
 +BLENDER_TEST(BLI_chained_strings "bf_blenlib")
+ BLENDER_TEST(BLI_delaunay_2d "bf_blenlib")
  BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
  BLENDER_TEST(BLI_edgehash "bf_blenlib")
  BLENDER_TEST(BLI_ghash "bf_blenlib")