Commit: 278d9c83229470abcedda42cac06a9784f2ed8f3
Author: Bastien Montagne
Date: Wed Nov 28 16:52:47 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB278d9c83229470abcedda42cac06a9784f2ed8f3
Merge branch 'master' into blender2.8
Conflicts:
source/blenderplayer/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt
===================================================================
===================================================================
diff --cc tests/gtests/blenlib/CMakeLists.txt
index e652fbecb36,43883e83f6e..e399d4651f5
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/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_heap_simple "bf_blenlib")
- BLENDER_TEST(BLI_kdopbvh "bf_blenlib")
- BLENDER_TEST(BLI_linklist_lockfree "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")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
