Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 28 Nov 2018 15:52:47 +0000 (16:52 +0100)
Conflicts:
source/blenderplayer/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt

1  2 
tests/gtests/blenlib/CMakeLists.txt

@@@ -47,9 -46,8 +47,9 @@@ BLENDER_TEST(BLI_expr_pylike_eval "bf_b
  BLENDER_TEST(BLI_ghash "bf_blenlib")
  BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
  BLENDER_TEST(BLI_heap "bf_blenlib")
- BLENDER_TEST(BLI_kdopbvh "bf_blenlib")
- BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib")
 +BLENDER_TEST(BLI_heap_simple "bf_blenlib")
+ BLENDER_TEST(BLI_kdopbvh "bf_blenlib;bf_intern_numaapi")
+ BLENDER_TEST(BLI_linklist_lockfree "bf_blenlib;bf_intern_numaapi")
  BLENDER_TEST(BLI_listbase "bf_blenlib")
  BLENDER_TEST(BLI_math_base "bf_blenlib")
  BLENDER_TEST(BLI_math_color "bf_blenlib")