blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender2.8' into blender2.8-workbench

This commit is contained in:
Jeroen Bakker 2018-04-16 15:02:40 +02:00
parent 410810d42f a3c80615d5
commit 4ed21f1360
14 changed files with 406 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_icons.h
View File

@ -75,6 +75,9 @@ void BKE_icon_changed(const int icon_id);
/* free all icons */
void BKE_icons_free(void);
/* free all icons marked for deferred deletion */
void BKE_icons_deferred_free(void);
/* free the preview image for use in list */
void BKE_previewimg_freefunc(void *link);

64
source/blender/blenkernel/intern/icons.c
View File

@ -49,7 +49,9 @@
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_linklist_lockfree.h"
#include "BLI_string.h"
#include "BLI_threads.h"
#include "BKE_icons.h"
#include "BKE_global.h" /* only for G.background test */
@ -72,6 +74,13 @@ static int gFirstIconId = 1;
static GHash *gCachedPreviews = NULL;
/* Queue of icons for deferred deletion. */
typedef struct DeferredIconDeleteNode {
struct DeferredIconDeleteNode *next;
int icon_id;
} DeferredIconDeleteNode;
static LockfreeLinkList g_icon_delete_queue;
static void icon_free(void *val)
{
Icon *icon = val;
@ -91,6 +100,7 @@ static void icon_free(void *val)
* after the integer number range is used up */
static int get_next_free_id(void)
{
BLI_assert(BLI_thread_is_main());
int startId = gFirstIconId;
/* if we haven't used up the int number range, we just return the next int */
@ -111,11 +121,15 @@ static int get_next_free_id(void)
void BKE_icons_init(int first_dyn_id)
{
BLI_assert(BLI_thread_is_main());
gNextIconId = first_dyn_id;
gFirstIconId = first_dyn_id;
if (!gIcons)
if (!gIcons) {
gIcons = BLI_ghash_int_new(__func__);
BLI_linklist_lockfree_init(&g_icon_delete_queue);
}
if (!gCachedPreviews) {
gCachedPreviews = BLI_ghash_str_new(__func__);
@ -124,6 +138,8 @@ void BKE_icons_init(int first_dyn_id)
void BKE_icons_free(void)
{
BLI_assert(BLI_thread_is_main());
if (gIcons) {
BLI_ghash_free(gIcons, NULL, icon_free);
gIcons = NULL;
@ -133,6 +149,22 @@ void BKE_icons_free(void)
BLI_ghash_free(gCachedPreviews, MEM_freeN, BKE_previewimg_freefunc);
gCachedPreviews = NULL;
}
BLI_linklist_lockfree_free(&g_icon_delete_queue, MEM_freeN);
}
void BKE_icons_deferred_free(void)
{
BLI_assert(BLI_thread_is_main());
for (DeferredIconDeleteNode *node =
(DeferredIconDeleteNode *)BLI_linklist_lockfree_begin(&g_icon_delete_queue);
node != NULL;
node = node->next)
{
BLI_ghash_remove(gIcons, SET_INT_IN_POINTER(node->icon_id), NULL, icon_free);
}
BLI_linklist_lockfree_clear(&g_icon_delete_queue, MEM_freeN);
}
static PreviewImage *previewimg_create_ex(size_t deferred_data_size)
@ -435,6 +467,8 @@ void BKE_previewimg_ensure(PreviewImage *prv, const int size)
void BKE_icon_changed(const int icon_id)
{
BLI_assert(BLI_thread_is_main());
Icon *icon = NULL;
if (!icon_id || G.background) return;
@ -462,6 +496,8 @@ void BKE_icon_changed(const int icon_id)
static int icon_id_ensure_create_icon(struct ID *id)
{
BLI_assert(BLI_thread_is_main());
Icon *new_icon = NULL;
new_icon = MEM_mallocN(sizeof(Icon), __func__);
@ -556,6 +592,8 @@ int BKE_icon_preview_ensure(ID *id, PreviewImage *preview)
Icon *BKE_icon_get(const int icon_id)
{
BLI_assert(BLI_thread_is_main());
Icon *icon = NULL;
icon = BLI_ghash_lookup(gIcons, SET_INT_IN_POINTER(icon_id));
@ -570,6 +608,8 @@ Icon *BKE_icon_get(const int icon_id)
void BKE_icon_set(const int icon_id, struct Icon *icon)
{
BLI_assert(BLI_thread_is_main());
void **val_p;
if (BLI_ghash_ensure_p(gIcons, SET_INT_IN_POINTER(icon_id), &val_p)) {
@ -580,12 +620,28 @@ void BKE_icon_set(const int icon_id, struct Icon *icon)
*val_p = icon;
}
static void icon_add_to_deferred_delete_queue(int icon_id)
{
DeferredIconDeleteNode *node =
MEM_mallocN(sizeof(DeferredIconDeleteNode), __func__);
node->icon_id = icon_id;
BLI_linklist_lockfree_insert(&g_icon_delete_queue,
(LockfreeLinkNode *)node);
}
void BKE_icon_id_delete(struct ID *id)
{
if (!id->icon_id) return; /* no icon defined for library object */
BLI_ghash_remove(gIcons, SET_INT_IN_POINTER(id->icon_id), NULL, icon_free);
const int icon_id = id->icon_id;
if (!icon_id) return; /* no icon defined for library object */
id->icon_id = 0;
if (!BLI_thread_is_main()) {
icon_add_to_deferred_delete_queue(icon_id);
return;
}
BKE_icons_deferred_free();
BLI_ghash_remove(gIcons, SET_INT_IN_POINTER(icon_id), NULL, icon_free);
}
/**

88
source/blender/blenlib/BLI_linklist_lockfree.h Normal file
View File

@ -0,0 +1,88 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2018 Blender Foundation.
* All rights reserved.
*
* Contributor(s): Sergey Sharybin.
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef __BLI_LINKLIST_LOCKFREE_H__
#define __BLI_LINKLIST_LOCKFREE_H__
/** \file BLI_linklist_lockfree.h
* \ingroup bli
*/
#ifdef __cplusplus
extern "C" {
#endif
typedef struct LockfreeLinkNode {
struct LockfreeLinkNode *next;
/* NOTE: "Subclass" this structure to add custom-defined data. */
} LockfreeLinkNode;
typedef struct LockfreeLinkList {
/* We keep a dummy node at the beginning of the list all the time.
* This allows us to make sure head and tail pointers are always
* valid, and saves from annoying exception cases in insert().
*/
LockfreeLinkNode dummy_node;
/* NOTE: This fields might point to a dummy node. */
LockfreeLinkNode *head, *tail;
} LockfreeLinkList;
typedef void (*LockfreeeLinkNodeFreeFP)(void *link);
/* ************************************************************************** */
/* NOTE: These functions are NOT safe for use from threads. */
/* NOTE: !!! I REPEAT: DO NOT USE THEM WITHOUT EXTERNAL LOCK !!! */
/* Make list ready for lock-free access. */
void BLI_linklist_lockfree_init(LockfreeLinkList *list);
/* Completely free the whole list, it is NOT re-usable after this. */
void BLI_linklist_lockfree_free(LockfreeLinkList *list,
LockfreeeLinkNodeFreeFP free_func);
/* Remove all the elements from the list, keep it usable for further
* inserts.
*/
void BLI_linklist_lockfree_clear(LockfreeLinkList *list,
LockfreeeLinkNodeFreeFP free_func);
/* Begin iteration of lock-free linked list, starting with a
* first user=defined node. Will ignore the dummy node.
*/
LockfreeLinkNode *BLI_linklist_lockfree_begin(LockfreeLinkList *list);
/* ************************************************************************** */
/* NOTE: These functions are safe for use from threads. */
void BLI_linklist_lockfree_insert(LockfreeLinkList *list,
LockfreeLinkNode *node);
#ifdef __cplusplus
}
#endif
#endif /* __BLI_LINKLIST_H__ */

3
source/blender/blenlib/CMakeLists.txt
View File

@ -50,6 +50,7 @@ set(SRC
intern/BLI_kdopbvh.c
intern/BLI_kdtree.c
intern/BLI_linklist.c
intern/BLI_linklist_lockfree.c
intern/BLI_memarena.c
intern/BLI_memiter.c
intern/BLI_mempool.c
@ -165,7 +166,7 @@ set(SRC
BLI_kdtree.h
BLI_lasso_2d.h
BLI_link_utils.h
BLI_linklist.h
BLI_linklist_lockfree.h
BLI_linklist_stack.h
BLI_listbase.h
BLI_math.h

91
source/blender/blenlib/intern/BLI_linklist_lockfree.c Normal file
View File

@ -0,0 +1,91 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2018 Blender Foundation.
* All rights reserved.
*
* Contributor(s): Sergey Sharybin.
*
* ***** END GPL LICENSE BLOCK *****
*/
/** \file blender/blenlib/intern/BLI_linklist_lockfree.c
* \ingroup bli
*/
#include "MEM_guardedalloc.h"
#include "BLI_linklist_lockfree.h"
#include "BLI_strict_flags.h"
#include "atomic_ops.h"
void BLI_linklist_lockfree_init(LockfreeLinkList *list)
{
list->dummy_node.next = NULL;
list->head = list->tail = &list->dummy_node;
}
void BLI_linklist_lockfree_free(LockfreeLinkList *list,
LockfreeeLinkNodeFreeFP free_func)
{
if (free_func != NULL) {
/* NOTE: We start from a first user-added node. */
LockfreeLinkNode *node = list->head->next;
while (node != NULL) {
LockfreeLinkNode *node_next = node->next;
free_func(node);
node = node_next;
}
}
}
void BLI_linklist_lockfree_clear(LockfreeLinkList *list,
LockfreeeLinkNodeFreeFP free_func)
{
BLI_linklist_lockfree_free(list, free_func);
BLI_linklist_lockfree_init(list);
}
void BLI_linklist_lockfree_insert(LockfreeLinkList *list,
LockfreeLinkNode *node)
{
/* Based on:
*
* John D. Valois
* Implementing Lock-Free Queues
*
* http://people.csail.mit.edu/bushl2/rpi/portfolio/lockfree-grape/documents/lock-free-linked-lists.pdf
*/
bool keep_working;
LockfreeLinkNode *tail_node;
node->next = NULL;
do {
tail_node = list->tail;
keep_working =
(atomic_cas_ptr((void**)&tail_node->next, NULL, node) != NULL);
if (keep_working) {
atomic_cas_ptr((void**)&list->tail, tail_node, tail_node->next);
}
} while (keep_working);
atomic_cas_ptr((void**)&list->tail, tail_node, node);
}
LockfreeLinkNode *BLI_linklist_lockfree_begin(LockfreeLinkList *list)
{
return list->head->next;
}

2
source/blender/collada/collada_utils.cpp
View File

@ -159,7 +159,7 @@ void bc_update_scene(EvaluationContext *eval_ctx, Scene *scene, float ctime)
{
BKE_scene_frame_set(scene, ctime);
Main *bmain = bc_get_main();
BKE_scene_graph_update_for_newframe(eval_ctx, eval_ctx->depsgraph, bmain, scene, eval_ctx->view_layer);
BKE_scene_graph_update_for_newframe(eval_ctx->depsgraph, bmain);
}
Object *bc_add_object(Scene *scene, ViewLayer *view_layer, int type, const char *name)

17
source/blender/draw/intern/draw_manager_exec.c
View File

@ -386,11 +386,10 @@ void DRW_state_clip_planes_reset(void)
/* Extract the 8 corners (world space).
* Although less accurate, this solution can be simplified as follows:
*
* BKE_boundbox_init_from_minmax(&bbox, (const float[3]){-1.0f, -1.0f, -1.0f}, (const float[3]){1.0f, 1.0f, 1.0f});
* for (int i = 0; i < 8; i++) {mul_project_m4_v3(viewprojinv, bbox.vec[i]);}
*/
static void UNUSED_FUNCTION(draw_frustum_boundbox_calc)(
static void draw_frustum_boundbox_calc(
const float (*projmat)[4], const float (*viewinv)[4], BoundBox *r_bbox)
{
float screenvecs[3][3], loc[3], near, far, w_half, h_half;
@ -426,8 +425,8 @@ static void UNUSED_FUNCTION(draw_frustum_boundbox_calc)(
madd_v3_v3fl(mid, ver, projmat[2][1]);
}
else {
madd_v3_v3fl(mid, hor, projmat[3][0]);
madd_v3_v3fl(mid, ver, projmat[3][1]);
madd_v3_v3fl(mid, hor, -projmat[3][0]);
madd_v3_v3fl(mid, ver, -projmat[3][1]);
}
r_bbox->vec[0][0] = mid[0] - ver[0] - hor[0];
@ -460,8 +459,8 @@ static void UNUSED_FUNCTION(draw_frustum_boundbox_calc)(
madd_v3_v3v3fl(mid, loc, screenvecs[2], -far);
/* Non-symmetric frustum. */
madd_v3_v3fl(mid, hor, projmat[3][0]);
madd_v3_v3fl(mid, ver, projmat[3][1]);
madd_v3_v3fl(mid, hor, -projmat[3][0]);
madd_v3_v3fl(mid, ver, -projmat[3][1]);
}
r_bbox->vec[1][0] = mid[0] - ver[0] - hor[0];
@ -493,13 +492,13 @@ static void draw_clipping_setup_from_view(void)
/* Extract Clipping Planes */
BoundBox bbox;
#if 0 /* does not currently work for all casses. */
draw_frustum_boundbox_calc(projmat, viewinv, &bbox);
#else
#if 0 /* It has accuracy problems. */
BKE_boundbox_init_from_minmax(&bbox, (const float[3]){-1.0f, -1.0f, -1.0f}, (const float[3]){1.0f, 1.0f, 1.0f});
for (int i = 0; i < 8; i++) {
mul_project_m4_v3(DST.view_data.matstate.mat[DRW_MAT_PERSINV], bbox.vec[i]);
}
#else
draw_frustum_boundbox_calc(projmat, viewinv, &bbox);
#endif
/* Compute clip planes using the world space frustum corners. */

2
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -4604,6 +4604,8 @@ void ED_view3d_cursor3d_update(bContext *C, const int mval[2])
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
else
WM_event_add_notifier(C, NC_SCENE | NA_EDITED, scene);
DEG_id_tag_update(&scene->id, DEG_TAG_COPY_ON_WRITE);
}
static int view3d_cursor3d_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)

17
source/blender/editors/space_view3d/view3d_select.c
View File

@ -55,6 +55,10 @@
#include "BLI_string.h"
#include "BLI_utildefines.h"
#ifdef __BIG_ENDIAN__
# include "BLI_endian_switch.h"
#endif
/* vertex box select */
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
@ -1980,11 +1984,16 @@ static int do_armature_box_select(
* Compare result of 'GPU_select': 'uint[4]',
* needed for when we need to align with object draw-order.
*/
static int opengl_select_buffer_cmp(const void *sel_a_p, const void *sel_b_p)
static int opengl_bone_select_buffer_cmp(const void *sel_a_p, const void *sel_b_p)
{
/* 4th element is select id */
const uint sel_a = ((uint *)sel_a_p)[3];
const uint sel_b = ((uint *)sel_b_p)[3];
uint sel_a = ((uint *)sel_a_p)[3];
uint sel_b = ((uint *)sel_b_p)[3];
#ifdef __BIG_ENDIAN__
BLI_endian_switch_uint32(&sel_a);
BLI_endian_switch_uint32(&sel_b);
#endif
if (sel_a < sel_b) {
return -1;
@ -2048,7 +2057,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b
col = vbuffer + 3;
/* The draw order doesn't always match the order we populate the engine, see: T51695. */
qsort(vbuffer, hits, sizeof(uint[4]), opengl_select_buffer_cmp);
qsort(vbuffer, hits, sizeof(uint[4]), opengl_bone_select_buffer_cmp);
/*
* Even though 'DRW_draw_select_loop' uses 'DEG_OBJECT_ITER_BEGIN',

2
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -177,7 +177,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
_nodetree_hash = NULL;
// Depsgraph
freestyle_depsgraph = DEG_graph_new(re->scene, view_layer, DAG_EVAL_RENDER);
freestyle_depsgraph = DEG_graph_new(freestyle_scene, view_layer, DAG_EVAL_RENDER);
DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &freestyle_scene->id, 0);
DEG_graph_id_tag_update(freestyle_bmain, freestyle_depsgraph, &object_camera->id, 0);
DEG_graph_tag_relations_update(freestyle_depsgraph);

4
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -617,9 +617,9 @@ bool ED_texture_context_check_others(const struct bContext *C) RET_ZERO
bool ED_text_region_location_from_cursor(SpaceText *st, ARegion *ar, const int cursor_co[2], int r_pixel_co[2]) RET_ZERO
SnapObjectContext *ED_transform_snap_object_context_create(
struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct RenderEngineType *engine, int flag) RET_NULL
struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, int flag) RET_NULL
SnapObjectContext *ED_transform_snap_object_context_create_view3d(
struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, struct RenderEngineType *engine, int flag,
struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer, int flag,
const struct ARegion *ar, const struct View3D *v3d) RET_NULL
void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE
bool ED_transform_snap_object_project_ray_ex(

130
tests/gtests/blenlib/BLI_linklist_lockfree_test.cc Normal file
View File

@ -0,0 +1,130 @@
/* Apache License, Version 2.0 */
#include "testing/testing.h"
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
#include "BLI_linklist_lockfree.h"
#include "BLI_task.h"
#include "BLI_threads.h"
TEST(LockfreeLinkList, Init)
{
LockfreeLinkList list;
BLI_linklist_lockfree_init(&list);
EXPECT_EQ(list.head, &list.dummy_node);
EXPECT_EQ(list.tail, &list.dummy_node);
BLI_linklist_lockfree_free(&list, NULL);
}
TEST(LockfreeLinkList, InsertSingle)
{
LockfreeLinkList list;
LockfreeLinkNode node;
BLI_linklist_lockfree_init(&list);
BLI_linklist_lockfree_insert(&list, &node);
EXPECT_EQ(list.head, &list.dummy_node);
EXPECT_EQ(list.head->next, &node);
EXPECT_EQ(list.tail, &node);
BLI_linklist_lockfree_free(&list, NULL);
}
TEST(LockfreeLinkList, InsertMultiple)
{
static const int num_nodes = 128;
LockfreeLinkList list;
LockfreeLinkNode nodes[num_nodes];
BLI_linklist_lockfree_init(&list);
/* Insert all the nodes. */
for (int i = 0; i < num_nodes; ++i) {
BLI_linklist_lockfree_insert(&list, &nodes[i]);
}
/* Check head and tail. */
EXPECT_EQ(list.head, &list.dummy_node);
EXPECT_EQ(list.tail, &nodes[num_nodes - 1]);
/* Check rest of the nodes. */
int node_index = 0;
for (LockfreeLinkNode *node = BLI_linklist_lockfree_begin(&list);
node != NULL;
node = node->next, ++node_index)
{
EXPECT_EQ(node, &nodes[node_index]);
if (node_index != num_nodes - 1) {
EXPECT_EQ(node->next, &nodes[node_index + 1]);
}
}
/* Free list. */
BLI_linklist_lockfree_free(&list, NULL);
}
namespace {
struct IndexedNode {
IndexedNode *next;
int index;
};
void concurrent_insert(TaskPool *__restrict pool,
void *taskdata,
int /*threadid*/)
{
LockfreeLinkList *list = (LockfreeLinkList *)BLI_task_pool_userdata(pool);
CHECK_NOTNULL(list);
IndexedNode *node = (IndexedNode *)MEM_mallocN(sizeof(IndexedNode),
"test node");
node->index = GET_INT_FROM_POINTER(taskdata);
BLI_linklist_lockfree_insert(list, (LockfreeLinkNode *)node);
}
} // namespace
TEST(LockfreeLinkList, InsertMultipleConcurrent)
{
static const int num_threads = 512;
static const int num_nodes = 655360;
/* Initialize list. */
LockfreeLinkList list;
BLI_linklist_lockfree_init(&list);
/* Initialize task scheduler and pool. */
TaskScheduler *scheduler = BLI_task_scheduler_create(num_threads);
TaskPool *pool = BLI_task_pool_create_suspended(scheduler, &list);
/* Push tasks to the pool. */
for (int i = 0; i < num_nodes; ++i) {
BLI_task_pool_push(pool,
concurrent_insert,
SET_INT_IN_POINTER(i),
false,
TASK_PRIORITY_HIGH);
}
/* Run all the tasks. */
BLI_threaded_malloc_begin();
BLI_task_pool_work_and_wait(pool);
BLI_threaded_malloc_end();
/* Verify we've got all the data properly inserted. */
EXPECT_EQ(list.head, &list.dummy_node);
bool *visited_nodes = (bool *)MEM_callocN(sizeof(bool) * num_nodes,
"visited nodes");
/* First, we make sure that none of the nodes are added twice. */
for (LockfreeLinkNode *node_v = BLI_linklist_lockfree_begin(&list);
node_v != NULL;
node_v = node_v->next)
{
IndexedNode *node = (IndexedNode *)node_v;
EXPECT_GE(node->index, 0);
EXPECT_LT(node->index, num_nodes);
EXPECT_FALSE(visited_nodes[node->index]);
visited_nodes[node->index] = true;
}
/* Then we make sure node was added. */
for (int node_index = 0; node_index < num_nodes; ++node_index) {
EXPECT_TRUE(visited_nodes[node_index]);
}
MEM_freeN(visited_nodes);
/* Cleanup data. */
BLI_linklist_lockfree_free(&list, MEM_freeN);
BLI_task_pool_free(pool);
BLI_task_scheduler_free(scheduler);
}

1
tests/gtests/blenlib/CMakeLists.txt
View File

@ -47,6 +47,7 @@ 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_listbase "bf_blenlib")
BLENDER_TEST(BLI_math_base "bf_blenlib")
BLENDER_TEST(BLI_math_color "bf_blenlib")

6
tests/python/collada/CMakeLists.txt
View File

@ -62,5 +62,7 @@ macro (COLLADA_TEST module test_name blend_file)
)
endmacro()
COLLADA_TEST(mesh simple mesh_simple.blend)
COLLADA_TEST(animation simple suzannes_parent_inverse.blend)
# Tests are disabled because they only work on Windows
# Tests will be redone completely to work reliable
#COLLADA_TEST(mesh simple mesh_simple.blend)
#COLLADA_TEST(animation simple suzannes_parent_inverse.blend)