Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-07-21 17:46:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-21 17:47:29 +0300
commit581a6da8048eb4e15189633dedcbce9e04156622 (patch)
tree87381d80833bda17880e7ebff49693941439c1ec /source/blender/freestyle
parent63da2c4082a432379fc7fa4ed0d2c34b4cb2858d (diff)
Fix incorrect use of BLI_assert with error strings
Some asserts were never raised because of invalid checks.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/intern/geometry/FastGrid.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp
index 1e0ae06da19..0f1edd647c7 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp
@@ -62,7 +62,7 @@ Cell *FastGrid::getCell(const Vec3u &p)
<< " " << _cells_size << endl;
}
#endif
- BLI_assert(_cells || ("_cells is a null pointer"));
+ BLI_assert_msg(_cells, "_cells is a null pointer");
BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
BLI_assert(p[0] < _cells_nb[0]);
BLI_assert(p[1] < _cells_nb[1]);
@@ -72,7 +72,7 @@ Cell *FastGrid::getCell(const Vec3u &p)
void FastGrid::fillCell(const Vec3u &p, Cell &cell)
{
- BLI_assert(_cells || ("_cells is a null pointer"));
+ BLI_assert_msg(_cells, "_cells is a null pointer");
BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
BLI_assert(p[0] < _cells_nb[0]);
BLI_assert(p[1] < _cells_nb[1]);