forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
Conflicts: source/blenderplayer/CMakeLists.txt tests/gtests/blenlib/CMakeLists.txt
This commit is contained in:
commit
278d9c8322
@ -48,8 +48,8 @@ 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")
|
||||
@ -60,7 +60,7 @@ BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
|
||||
BLENDER_TEST(BLI_stack "bf_blenlib")
|
||||
BLENDER_TEST(BLI_string "bf_blenlib")
|
||||
BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
|
||||
BLENDER_TEST(BLI_task "bf_blenlib")
|
||||
BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi")
|
||||
|
||||
BLENDER_TEST_PERFORMANCE(BLI_ghash_performance "bf_blenlib")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user