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>2013-05-14 02:58:27 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-05-14 02:58:27 +0400
commit6ea2dec330a0d460deb1396f258c461be34fa3c8 (patch)
tree567536490f059ab57592b5352b60f253b7e3ea1c /source/blender/freestyle/intern/view_map/SphericalGrid.h
parent1a91af691e984714204aa55326245c79a0b06fb8 (diff)
Added support for WITH_CXX_GUARDEDALLOC build option to the Freestyle module.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/SphericalGrid.h')
-rw-r--r--source/blender/freestyle/intern/view_map/SphericalGrid.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h
index 9551a0a3e95..56d2ae3cf5e 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.h
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h
@@ -49,6 +49,10 @@
#include "BKE_global.h"
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
namespace Freestyle {
class SphericalGrid
@@ -65,6 +69,10 @@ public:
// However, code comments make it clear that userdata is deprecated, so we avoid the temptation to save
// 4 or 8 bytes.
WFace *face;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid:OccluderData")
+#endif
};
private:
@@ -125,6 +133,12 @@ public:
real _occludeeDepth;
//deque<OccluderData*>::iterator _current, _occludeeCandidate;
vector<OccluderData*>::iterator _current, _occludeeCandidate;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+ public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid:Iterator")
+#endif
+
};
class Transform : public GridHelpers::Transform
@@ -175,6 +189,11 @@ private:
occluderContainer _faces;
Vec3r _viewpoint;
bool _enableQI;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+ MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SphericalGrid")
+#endif
};
inline void SphericalGrid::Iterator::initBeforeTarget()