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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-04-17 07:55:17 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-04-17 09:37:11 +0400
commit68aea619f512afb0fd9f4b06313cd2ea8b896146 (patch)
tree2a9779bf70ca7ed587b54020da855254559a3ce2 /source/blender/freestyle/intern/geometry/FastGrid.cpp
parent3458bad12d4ba7c1184a44fcdabfef265335d30c (diff)
Replaced assert() with BLI_assert().
Diffstat (limited to 'source/blender/freestyle/intern/geometry/FastGrid.cpp')
-rw-r--r--source/blender/freestyle/intern/geometry/FastGrid.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp
index 438cac3c209..ddfc8bdd20c 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp
@@ -28,6 +28,7 @@
#include "FastGrid.h"
#include "BKE_global.h"
+#include "BLI_utildefines.h"
namespace Freestyle {
@@ -63,21 +64,21 @@ Cell *FastGrid::getCell(const Vec3u& p)
<< " " << _cells_size << endl;
}
#endif
- assert(_cells || ("_cells is a null pointer"));
- assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
- assert(p[0] < _cells_nb[0]);
- assert(p[1] < _cells_nb[1]);
- assert(p[2] < _cells_nb[2]);
+ BLI_assert(_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]);
+ BLI_assert(p[2] < _cells_nb[2]);
return _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]];
}
void FastGrid::fillCell(const Vec3u& p, Cell& cell)
{
- assert(_cells || ("_cells is a null pointer"));
- assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
- assert(p[0] < _cells_nb[0]);
- assert(p[1] < _cells_nb[1]);
- assert(p[2] < _cells_nb[2]);
+ BLI_assert(_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]);
+ BLI_assert(p[2] < _cells_nb[2]);
_cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]] = &cell;
}