diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-08-26 07:32:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-26 07:32:35 +0300 |
| commit | 7b61fe1638051b3b2e296680a000819f31672414 (patch) | |
| tree | 7b640b7fb07ac3d1663fc683c903d3b5e33bbf42 /source/blender/blenkernel | |
| parent | 8d03e04493023d63ec05321ab8dc48dbd22363f2 (diff) | |
Cleanup: use BLI_assert
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index e3df3dd9ba2..85a12027bf2 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -1666,7 +1666,7 @@ void bvhcache_insert(BVHCache **cache_p, BVHTree *tree, int type) { BVHCacheItem *item = NULL; - assert(bvhcache_find(*cache_p, type, &(BVHTree *){0}) == false); + BLI_assert(bvhcache_find(*cache_p, type, &(BVHTree *){0}) == false); item = MEM_mallocN(sizeof(BVHCacheItem), "BVHCacheItem"); diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 04cbdbb6bcd..91b169590ac 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -2755,7 +2755,7 @@ static bool dynamicPaint_symmetrizeAdjData(PaintAdjData *ed, int active_points) for (int i = 0, idx = ed->n_index[index]; i < ed->n_num[index]; i++) { const int target = ed->n_target[idx + i]; - assert(!(ed->flags[target] & ADJ_BORDER_PIXEL)); + BLI_assert(!(ed->flags[target] & ADJ_BORDER_PIXEL)); if (!dynamicPaint_pointHasNeighbor(ed, target, index)) { new_n_num[target]++; @@ -2782,7 +2782,7 @@ static bool dynamicPaint_symmetrizeAdjData(PaintAdjData *ed, int active_points) new_n_num[index] = ed->n_num[index]; } - assert(n_pos == total_targets); + BLI_assert(n_pos == total_targets); /* Add symmetrized - this loop behavior must exactly match the count pass above */ for (int index = 0; index < active_points; index++) { @@ -5572,7 +5572,7 @@ static void dynamic_paint_border_cb(void *__restrict userdata, PaintPoint *pPoint2 = &((PaintPoint *)sData->type_data)[target]; - assert(!(sData->adj_data->flags[target] & ADJ_BORDER_PIXEL)); + BLI_assert(!(sData->adj_data->flags[target] & ADJ_BORDER_PIXEL)); madd_v3_v3fl(mix_color, pPoint2->color, pPoint2->color[3]); mix_color[3] += pPoint2->color[3]; |