griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merging r48257 through r48263 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2012-06-25 10:56:48 +00:00
parent 6023c356e5 1755a0ada6
commit ae063aae50
166 changed files with 439 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenlib/intern/math_color_inline.c
View File

@@ -222,8 +222,16 @@ MINLINE void cpack_cpy_3ub(unsigned char r_col[3], const unsigned int pack)
r_col[2] = ((pack) >> 16) & 0xFF;
}
/* XXX - investigate when/why rgb_to_bw & rgb_to_grayscale are different,
* and why we use both! whats the purpose of this? */
/* TODO:
*
* regarding #rgb_to_bw vs #rgb_to_grayscale,
* it seems nobody knows why we have both functions which convert color to greys
* but with different influences, this is quite stupid, and should be resolved
* by someone who knows this stuff: see this thread
* http://lists.blender.org/pipermail/bf-committers/2012-June/037180.html
*
* Only conclusion is that rgb_to_grayscale is used more for compositing.
*/
MINLINE float rgb_to_bw(const float rgb[3])
{
return 0.35f * rgb[0] + 0.45f * rgb[1] + 0.2f * rgb[2];

9
source/blender/compositor/intern/COM_ChunkOrderHotspot.h
View File

@@ -23,6 +23,10 @@
#ifndef _COM_ChunkOrderHotSpot_h_
#define _COM_ChunkOrderHotSpot_h_
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
class ChunkOrderHotspot {
private:
int x;
@@ -32,6 +36,11 @@ private:
public:
ChunkOrderHotspot(int x, int y, float addition);
double determineDistance(int x, int y);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot")
#endif
};
#endif

4
source/blender/compositor/intern/COM_Converter.h
View File

@@ -66,5 +66,9 @@ public:
* @see SocketConnection - a link between two sockets
*/
static void convertResolution(SocketConnection *connection, ExecutionSystem *system);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:Converter")
#endif
};
#endif

3
source/blender/compositor/intern/COM_Device.h
View File

@@ -48,6 +48,9 @@ public:
*/
virtual void execute(WorkPackage *work) = 0;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:Device")
#endif
};
#endif

5
source/blender/compositor/intern/COM_ExecutionGroup.h
View File

@@ -394,7 +394,10 @@ public:
* @see ExecutionSystem.execute
*/
CompositorPriority getRenderPriotrity();
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup")
#endif
};
#endif

4
source/blender/compositor/intern/COM_ExecutionSystem.cpp
View File

@@ -41,6 +41,10 @@
#include "BKE_global.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
ExecutionSystem::ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering)
{
context.setbNodeTree(editingtree);

6
source/blender/compositor/intern/COM_ExecutionSystem.h
View File

@@ -232,5 +232,9 @@ private:
void executeGroups(CompositorPriority priority);
};
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystem")
#endif
};
#endif /* _COM_ExecutionSystem_h */

7
source/blender/compositor/intern/COM_ExecutionSystemHelper.h
View File

@@ -123,5 +123,10 @@ public:
* @param system the execution system to dump
*/
static void debugDump(ExecutionSystem *system);
};
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystemHelper")
#endif
};
#endif /* _COM_ExecutionSystemHelper_h */

4
source/blender/compositor/intern/COM_MemoryBuffer.h
View File

@@ -166,6 +166,10 @@ public:
float *convertToValueBuffer();
private:
unsigned int determineBufferSize();
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer")
#endif
};
#endif

4
source/blender/compositor/intern/COM_MemoryProxy.h
View File

@@ -102,6 +102,10 @@ public:
* @brief get the allocated memory
*/
inline MemoryBuffer *getBuffer() { return this->buffer; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryProxy")
#endif
};
#endif

5
source/blender/compositor/intern/COM_NodeBase.h
View File

@@ -141,6 +141,11 @@ protected:
*/
void addOutputSocket(DataType datatype);
void addOutputSocket(DataType datatype, bNodeSocket *socket);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeBase")
#endif
};
#endif

4
source/blender/compositor/intern/COM_NodeOperation.h
View File

@@ -270,6 +270,10 @@ protected:
* @brief set if this NodeOperation can be scheduled on a OpenCLDevice
*/
void setOpenCL(bool openCL) { this->openCL = openCL; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeOperation")
#endif
};
#endif

7
source/blender/compositor/intern/COM_Socket.h
View File

@@ -29,6 +29,10 @@
#include "DNA_node_types.h"
#include "COM_defines.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
using namespace std;
class SocketConnection;
class NodeBase;
@@ -74,6 +78,9 @@ public:
void setEditorSocket(bNodeSocket *editorSocket) { this->editorSocket = editorSocket; }
bNodeSocket *getbNodeSocket() const { return this->editorSocket; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:Socket")
#endif
};

4
source/blender/compositor/intern/COM_SocketConnection.h
View File

@@ -118,6 +118,10 @@ public:
* @return needs conversion [true:false]
*/
bool needsResolutionConversion() const;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketConnection")
#endif
};
#endif

10
source/blender/compositor/intern/COM_SocketReader.h
View File

@@ -25,6 +25,10 @@
#include "BLI_rect.h"
#include "COM_defines.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif
typedef enum PixelSampler {
COM_PS_NEAREST,
COM_PS_BILINEAR,
@@ -106,6 +110,10 @@ public:
inline const unsigned int getWidth() const { return this->width; }
inline const unsigned int getHeight() const { return this->height; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader")
#endif
};
#endif
#endif /* _COM_SocketReader_h */

4
source/blender/compositor/intern/COM_WorkPackage.h
View File

@@ -59,6 +59,10 @@ public:
* @brief get the number of the chunk
*/
unsigned int getChunkNumber() const { return this->chunkNumber; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkPackage")
#endif
};
#endif

7
source/blender/compositor/intern/COM_WorkScheduler.h
View File

@@ -110,5 +110,10 @@ public:
* @see CompositorContext.getHasActiveOpenCLDevices
*/
static bool hasGPUDevices();
};
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkScheduler")
#endif
};
#endif /* _COM_WorkScheduler_h_ */

15
source/blender/compositor/intern/COM_compositor.cpp
View File

@@ -33,20 +33,21 @@ extern "C" {
#include "COM_WorkScheduler.h"
#include "OCL_opencl.h"
static ThreadMutex *compositorMutex;
static ThreadMutex compositorMutex = {{0}};
static char is_compositorMutex_init = FALSE;
void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
{
if (compositorMutex == NULL) { /// TODO: move to blender startup phase
compositorMutex = new ThreadMutex();
BLI_mutex_init(compositorMutex);
if (is_compositorMutex_init == FALSE) { /// TODO: move to blender startup phase
BLI_mutex_init(&compositorMutex);
OCL_init();
WorkScheduler::initialize(); ///TODO: call workscheduler.deinitialize somewhere
is_compositorMutex_init = TRUE;
}
BLI_mutex_lock(compositorMutex);
BLI_mutex_lock(&compositorMutex);
if (editingtree->test_break(editingtree->tbh)) {
// during editing multiple calls to this method can be triggered.
// make sure one the last one will be doing the work.
BLI_mutex_unlock(compositorMutex);
BLI_mutex_unlock(&compositorMutex);
return;
}
@@ -60,5 +61,5 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
system->execute();
delete system;
BLI_mutex_unlock(compositorMutex);
BLI_mutex_unlock(&compositorMutex);
}

59
source/blender/compositor/nodes/COM_KeyingNode.cpp
View File

@@ -40,6 +40,9 @@
#include "COM_SetAlphaOperation.h"
#include "COM_GaussianAlphaXBlurOperation.h"
#include "COM_GaussianAlphaYBlurOperation.h"
KeyingNode::KeyingNode(bNode *editorNode) : Node(editorNode)
{
/* pass */
@@ -116,15 +119,15 @@ OutputSocket *KeyingNode::setupPostBlur(ExecutionSystem *graph, OutputSocket *po
OutputSocket *KeyingNode::setupDilateErode(ExecutionSystem *graph, OutputSocket *dilateErodeInput, int distance)
{
DilateStepOperation *dilateErodeOperation;
DilateDistanceOperation *dilateErodeOperation;
if (distance > 0) {
dilateErodeOperation = new DilateStepOperation();
dilateErodeOperation->setIterations(distance);
dilateErodeOperation = new DilateDistanceOperation();
dilateErodeOperation->setDistance(distance);
}
else {
dilateErodeOperation = new ErodeStepOperation();
dilateErodeOperation->setIterations(-distance);
dilateErodeOperation = new ErodeDistanceOperation();
dilateErodeOperation->setDistance(-distance);
}
addLink(graph, dilateErodeInput, dilateErodeOperation->getInputSocket(0));
@@ -134,6 +137,46 @@ OutputSocket *KeyingNode::setupDilateErode(ExecutionSystem *graph, OutputSocket
return dilateErodeOperation->getOutputSocket(0);
}
OutputSocket *KeyingNode::setupFeather(ExecutionSystem *graph, CompositorContext *context,
OutputSocket *featherInput, int falloff, int distance)
{
/* this uses a modified gaussian blur function otherwise its far too slow */
CompositorQuality quality = context->getQuality();
/* initialize node data */
NodeBlurData *data = (NodeBlurData *)&this->alpha_blur;
memset(data, 0, sizeof(*data));
data->filtertype = R_FILTER_GAUSS;
if (distance > 0) {
data->sizex = data->sizey = distance;
}
else {
data->sizex = data->sizey = -distance;
}
GaussianAlphaXBlurOperation *operationx = new GaussianAlphaXBlurOperation();
operationx->setData(data);
operationx->setQuality(quality);
operationx->setSize(1.0f);
operationx->setSubtract(distance < 0);
operationx->setFalloff(falloff);
graph->addOperation(operationx);
GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation();
operationy->setData(data);
operationy->setQuality(quality);
operationy->setSize(1.0f);
operationy->setSubtract(distance < 0);
operationy->setFalloff(falloff);
graph->addOperation(operationy);
addLink(graph, featherInput, operationx->getInputSocket(0));
addLink(graph, operationx->getOutputSocket(), operationy->getInputSocket(0));
return operationy->getOutputSocket();
}
OutputSocket *KeyingNode::setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputScreen, float factor)
{
KeyingDespillOperation *despillOperation = new KeyingDespillOperation();
@@ -225,6 +268,12 @@ void KeyingNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
postprocessedMatte = setupDilateErode(graph, postprocessedMatte, keying_data->dilate_distance);
}
/* matte feather */
if (keying_data->feather_distance != 0) {
postprocessedMatte = setupFeather(graph, context, postprocessedMatte, keying_data->feather_falloff,
keying_data->feather_distance);
}
/* set alpha channel to output image */
SetAlphaOperation *alphaOperation = new SetAlphaOperation();
addLink(graph, originalImage, alphaOperation->getInputSocket(0));

4
source/blender/compositor/nodes/COM_KeyingNode.h
View File

@@ -29,9 +29,13 @@
*/
class KeyingNode : public Node {
protected:
NodeBlurData alpha_blur; /* only used for blurring alpha, since the dilate/erode node doesnt have this */
OutputSocket *setupPreBlur(ExecutionSystem *graph, InputSocket *inputImage, int size, OutputSocket **originalImage);
OutputSocket *setupPostBlur(ExecutionSystem *graph, OutputSocket *postBlurInput, int size);
OutputSocket *setupDilateErode(ExecutionSystem *graph, OutputSocket *dilateErodeInput, int distance);
OutputSocket *setupFeather(ExecutionSystem *graph, CompositorContext *context, OutputSocket *featherInput,
int falloff, int distance);
OutputSocket *setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputSrceen, float factor);
OutputSocket *setupClip(ExecutionSystem *graph, OutputSocket *clipInput, int kernelRadius, float kernelTolerance,
float clipBlack, float clipWhite, bool edgeMatte);

6
source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
View File

@@ -116,8 +116,7 @@ KeyingScreenOperation::TriangulationData *KeyingScreenOperation::buildVoronoiTri
sites = (VoronoiSite *) MEM_callocN(sizeof(VoronoiSite) * sites_total, "keyingscreen voronoi sites");
track = (MovieTrackingTrack *) tracksbase->first;
i = 0;
while (track) {
for (track = (MovieTrackingTrack *) tracksbase->first, i = 0; track; track = track->next, i++) {
VoronoiSite *site = &sites[i];
MovieTrackingMarker *marker = BKE_tracking_marker_get(track, clip_frame);
ImBuf *pattern_ibuf = BKE_tracking_get_pattern_imbuf(ibuf, track, marker, TRUE, FALSE);
@@ -142,9 +141,6 @@ KeyingScreenOperation::TriangulationData *KeyingScreenOperation::buildVoronoiTri
site->co[0] = marker->pos[0] * width;
site->co[1] = marker->pos[1] * height;
track = track->next;
i++;
}
IMB_freeImBuf(ibuf);

2
source/blender/editors/space_node/drawnode.c
View File

@@ -2483,6 +2483,8 @@ static void node_composit_buts_keying(uiLayout *layout, bContext *UNUSED(C), Poi
uiItemR(layout, ptr, "clip_black", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "clip_white", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "dilate_distance", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "feather_falloff", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "feather_distance", 0, NULL, ICON_NONE);
uiItemR(layout, ptr, "blur_post", 0, NULL, ICON_NONE);
}

2
source/blender/makesdna/DNA_node_types.h
View File

@@ -655,6 +655,8 @@ typedef struct NodeKeyingData {
float edge_kernel_tolerance;
float clip_black, clip_white;
int dilate_distance;
int feather_distance;
int feather_falloff;
int blur_pre, blur_post;
} NodeKeyingData;

12
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -3620,6 +3620,18 @@ static void def_cmp_keying(StructRNA *srna)
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Edge Kernel Tolerance", "Tolerance to pixels inside kernel which are treating as belonging to the same plane");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "feather_falloff", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "feather_falloff");
RNA_def_property_enum_items(prop, proportional_falloff_curve_only_items);
RNA_def_property_ui_text(prop, "Feather Falloff", "Falloff type the feather");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "feather_distance", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "feather_distance");
RNA_def_property_range(prop, -100, 100);
RNA_def_property_ui_text(prop, "Feather Distance", "Distance to grow/shrink the feather");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
static void def_cmp_trackpos(StructRNA *srna)

4
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
View File

@@ -194,9 +194,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderCanvas")
#endif
};

4
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
View File

@@ -72,9 +72,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
void operator delete(void *mem) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderInputDevice")
#endif
};
#endif //__KX_BLENDERINPUTDEVICE_H__

4
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
View File

@@ -55,9 +55,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
void operator delete(void *mem) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderKeyboardDevice")
#endif
};

4
source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
View File

@@ -51,9 +51,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
void operator delete(void *mem) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderMouseDevice")
#endif
};

4
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
View File

@@ -108,9 +108,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderRenderTools")
#endif
};

4
source/gameengine/BlenderRoutines/KX_BlenderSystem.h
View File

@@ -49,9 +49,7 @@ public:
virtual double GetTimeInSeconds();
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSystem")
#endif
};

4
source/gameengine/Converter/BL_DeformableGameObject.h
View File

@@ -100,9 +100,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_DeformableGameObject")
#endif
};

4
source/gameengine/Converter/BL_MeshDeformer.h
View File

@@ -90,9 +90,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_MeshDeformer")
#endif
};

4
source/gameengine/Converter/BL_ModifierDeformer.h
View File

@@ -107,9 +107,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ModifierDeformer")
#endif
};

4
source/gameengine/Converter/BL_ShapeDeformer.h
View File

@@ -79,9 +79,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
#endif
};

4
source/gameengine/Converter/BL_SkinDeformer.h
View File

@@ -116,9 +116,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_SkinDeformer")
#endif
};

4
source/gameengine/Converter/BlenderWorldInfo.h
View File

@@ -100,9 +100,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BlenderWorldInfo")
#endif
};

8
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
View File

@@ -55,9 +55,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ScalarInterpolator")
#endif
};
@@ -71,9 +69,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_InterpolatorList")
#endif
};

4
source/gameengine/Converter/KX_BlenderSceneConverter.h
View File

@@ -191,9 +191,7 @@ public:
#endif
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BlenderSceneConverter")
#endif
};

4
source/gameengine/Converter/KX_SoftBodyDeformer.h
View File

@@ -93,9 +93,7 @@ protected:
//class RAS_MeshObject *m_pMesh;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ShapeDeformer")
#endif
};

5
source/gameengine/Expressions/BoolValue.h
View File

@@ -56,11 +56,8 @@ public:
private:
bool m_bool;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CBoolValue")
#endif
};

4
source/gameengine/Expressions/ConstExpr.h
View File

@@ -47,9 +47,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CConstExpr")
#endif
};

4
source/gameengine/Expressions/EmptyValue.h
View File

@@ -41,9 +41,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CEmptyValue")
#endif
};

4
source/gameengine/Expressions/ErrorValue.h
View File

@@ -39,9 +39,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CErrorValue")
#endif
};

8
source/gameengine/Expressions/Expression.h
View File

@@ -74,9 +74,7 @@ class CBrokenLinkInfo
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CBrokenLinkInfo")
#endif
};
@@ -144,9 +142,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CExpression")
#endif
};

4
source/gameengine/Expressions/FloatValue.h
View File

@@ -50,9 +50,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CFloatValue")
#endif
};

4
source/gameengine/Expressions/IdentifierExpr.h
View File

@@ -52,9 +52,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIdentifierExpr")
#endif
};

4
source/gameengine/Expressions/IfExpr.h
View File

@@ -51,9 +51,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIfExpr")
#endif
};

4
source/gameengine/Expressions/InputParser.h
View File

@@ -110,9 +110,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CParser")
#endif
};

4
source/gameengine/Expressions/IntValue.h
View File

@@ -65,9 +65,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CIntValue")
#endif
};

4
source/gameengine/Expressions/KX_HashedPtr.h
View File

@@ -54,9 +54,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CHashedPtr")
#endif
};

4
source/gameengine/Expressions/Operator1Expr.h
View File

@@ -52,9 +52,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:")
#endif
};

4
source/gameengine/Expressions/Operator2Expr.h
View File

@@ -58,9 +58,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:COperator2Expr")
#endif
};

18
source/gameengine/Expressions/PyObjectPlus.h
View File

@@ -166,7 +166,7 @@ public: \
void *operator new(size_t num_bytes) { \
return MEM_mallocN(num_bytes, Type.tp_name); \
} \
void operator delete( void *mem ) { \
void operator delete(void *mem) { \
MEM_freeN(mem); \
} \
@@ -534,21 +534,11 @@ typedef PyTypeObject *PyParentObject; /* Define the PyParent Object */
#ifdef WITH_CXX_GUARDEDALLOC
#define Py_Header \
public: \
void *operator new(size_t num_bytes) { \
return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); \
} \
void operator delete( void *mem ) { \
MEM_freeN(mem); \
} \
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlus") \
#define Py_HeaderPtr \
public: \
void *operator new(size_t num_bytes) { \
return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); \
} \
void operator delete( void *mem ) { \
MEM_freeN(mem); \
} \
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PyObjectPlusPtr") \
#else // WITH_CXX_GUARDEDALLOC

4
source/gameengine/Expressions/StringValue.h
View File

@@ -53,9 +53,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CStringValue")
#endif
};

9
source/gameengine/Expressions/Value.h
View File

@@ -164,9 +164,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CAction")
#endif
};
@@ -436,11 +434,8 @@ public:
protected:
STR_String m_strNewName; // Identification
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CPropValue")
#endif
};

4
source/gameengine/Expressions/VectorValue.h
View File

@@ -86,9 +86,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CVectorValue")
#endif
};

4
source/gameengine/Expressions/VoidValue.h
View File

@@ -66,9 +66,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CVoidValue")
#endif
};

4
source/gameengine/GameLogic/SCA_ActuatorEventManager.h
View File

@@ -49,9 +49,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_ActuatorEventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_AlwaysEventManager.h
View File

@@ -43,9 +43,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_AlwaysEventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_BasicEventManager.h
View File

@@ -50,9 +50,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_BasicEventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_EventManager.h
View File

@@ -84,9 +84,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_EventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_ExpressionController.h
View File

@@ -59,9 +59,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_ExpressionController")
#endif
};

4
source/gameengine/GameLogic/SCA_IActuator.h
View File

@@ -160,9 +160,7 @@ public:
bool IsType(KX_ACTUATOR_TYPE type) { return m_type == type; }
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_IActuator")
#endif
};

4
source/gameengine/GameLogic/SCA_IInputDevice.h
View File

@@ -316,9 +316,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
void operator delete(void *mem) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_InputEvent")
#endif
};

4
source/gameengine/GameLogic/SCA_IScene.h
View File

@@ -74,9 +74,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_IScene")
#endif
};

4
source/gameengine/GameLogic/SCA_JoystickManager.h
View File

@@ -51,9 +51,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_JoystickManager")
#endif
};

4
source/gameengine/GameLogic/SCA_KeyboardManager.h
View File

@@ -59,9 +59,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_KeyboardManager")
#endif
};

4
source/gameengine/GameLogic/SCA_LogicManager.h
View File

@@ -147,9 +147,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_LogicManager")
#endif
};

4
source/gameengine/GameLogic/SCA_MouseManager.h
View File

@@ -68,9 +68,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_MouseManager")
#endif
};

4
source/gameengine/GameLogic/SCA_PropertyEventManager.h
View File

@@ -48,9 +48,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_PropertyEventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_RandomEventManager.h
View File

@@ -47,9 +47,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_RandomEventManager")
#endif
};

4
source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
View File

@@ -77,9 +77,7 @@ class SCA_RandomNumberGenerator {
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_RandomNumberGenerator")
#endif
};

4
source/gameengine/GameLogic/SCA_TimeEventManager.h
View File

@@ -55,9 +55,7 @@ public:
vector<CValue*> GetTimeValues();
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_TimeEventManager")
#endif
};

4
source/gameengine/Ketsji/BL_Action.h
View File

@@ -132,9 +132,7 @@ public:
};
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Action"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Action")
#endif
};

4
source/gameengine/Ketsji/BL_ActionManager.h
View File

@@ -94,9 +94,7 @@ public:
void Update(float);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ActionManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_ActionManager")
#endif
};

4
source/gameengine/Ketsji/BL_BlenderShader.h
View File

@@ -97,9 +97,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_BlenderShader")
#endif
};

4
source/gameengine/Ketsji/BL_Material.h
View File

@@ -110,9 +110,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Material")
#endif
};

12
source/gameengine/Ketsji/BL_Shader.h
View File

@@ -32,9 +32,7 @@ public:
int mLoc; // Sampler location
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Sampler")
#endif
};
@@ -79,9 +77,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Uniform")
#endif
};
@@ -104,9 +100,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_DefUniform")
#endif
};

4
source/gameengine/Ketsji/BL_Texture.h
View File

@@ -74,9 +74,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:BL_Texture")
#endif
};

4
source/gameengine/Ketsji/KX_BulletPhysicsController.h
View File

@@ -92,9 +92,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BulletPhysicsController")
#endif
};

4
source/gameengine/Ketsji/KX_CameraIpoSGController.h
View File

@@ -90,9 +90,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_CameraIpoSGController")
#endif
};

4
source/gameengine/Ketsji/KX_ClientObjectInfo.h
View File

@@ -80,9 +80,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ClientObjectInfo")
#endif
};

4
source/gameengine/Ketsji/KX_Dome.h
View File

@@ -191,9 +191,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_Dome")
#endif
};

4
source/gameengine/Ketsji/KX_EmptyObject.h
View File

@@ -43,9 +43,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_EmptyObject")
#endif
};

6
source/gameengine/Ketsji/KX_FontObject.h
View File

@@ -69,12 +69,8 @@ protected:
class RAS_IRenderTools* m_rendertools; //needed for drawing routine
#if 0 // WHY COMMENTED? - campbell
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_FontObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
#endif
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_FontObject")
#endif
#ifdef WITH_PYTHON

4
source/gameengine/Ketsji/KX_IInterpolator.h
View File

@@ -46,9 +46,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IInterpolator")
#endif
};

7
source/gameengine/Ketsji/KX_IPO_SGController.h
View File

@@ -119,11 +119,10 @@ public:
m_ipotime = time;
m_modified = true;
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IpoSGController")
#endif
};

4
source/gameengine/Ketsji/KX_IPhysicsController.h
View File

@@ -141,9 +141,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IPhysicsController")
#endif
};

4
source/gameengine/Ketsji/KX_IScalarInterpolator.h
View File

@@ -44,9 +44,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_IScalarInterpolator")
#endif
};

4
source/gameengine/Ketsji/KX_ISceneConverter.h
View File

@@ -89,9 +89,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ISceneConverter")
#endif
};

4
source/gameengine/Ketsji/KX_ISystem.h
View File

@@ -55,9 +55,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ISystem")
#endif
};

4
source/gameengine/Ketsji/KX_KetsjiEngine.h
View File

@@ -443,9 +443,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_KetsjiEngine")
#endif
};

4
source/gameengine/Ketsji/KX_LightIpoSGController.h
View File

@@ -98,9 +98,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_LightIpoSGController")
#endif
};

4
source/gameengine/Ketsji/KX_MaterialIpoController.h
View File

@@ -58,9 +58,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_MaterialIpoController")
#endif
};

3
source/gameengine/Ketsji/KX_MotionState.h
View File

@@ -58,8 +58,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_MotionState")
#endif
};

4
source/gameengine/Ketsji/KX_ObColorIpoSGController.h
View File

@@ -73,9 +73,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ObColorIpoSGController")
#endif
};

4
source/gameengine/Ketsji/KX_OrientationInterpolator.h
View File

@@ -56,9 +56,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
private:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_OrientationInterpolator")
#endif
};

4
source/gameengine/Ketsji/KX_PositionInterpolator.h
View File

@@ -56,9 +56,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
private:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_PositionInterpolator")
#endif
};

8
source/gameengine/Ketsji/KX_RayCast.h
View File

@@ -96,9 +96,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayCast")
#endif
};
@@ -135,9 +133,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayCast::Callback")
#endif
};

4
source/gameengine/Ketsji/KX_RayEventManager.h
View File

@@ -46,9 +46,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_RayEventManager")
#endif
};

4
source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
View File

@@ -89,9 +89,7 @@ private :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_BoneParentRelation")
#endif
};

12
source/gameengine/Ketsji/KX_SG_NodeRelationships.h
View File

@@ -88,9 +88,7 @@ private :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_NormalParentRelation")
#endif
};
@@ -145,9 +143,7 @@ private :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_VertexParentRelation")
#endif
};
@@ -228,9 +224,7 @@ private :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_SlowParentRelation")
#endif
};

4
source/gameengine/Ketsji/KX_ScalarInterpolator.h
View File

@@ -61,9 +61,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ScalarInterpolator")
#endif
};

4
source/gameengine/Ketsji/KX_ScalingInterpolator.h
View File

@@ -56,9 +56,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_ScalingInterpolator")
#endif
};

4
source/gameengine/Ketsji/KX_TimeCategoryLogger.h
View File

@@ -129,9 +129,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_TimeCategoryLogger")
#endif
};

4
source/gameengine/Ketsji/KX_TimeLogger.h
View File

@@ -107,9 +107,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_TimeLogger")
#endif
};

4
source/gameengine/Ketsji/KX_TouchEventManager.h
View File

@@ -81,9 +81,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_TouchEventManager")
#endif
};

4
source/gameengine/Ketsji/KX_WorldInfo.h
View File

@@ -70,9 +70,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldInfo")
#endif
};

4
source/gameengine/Ketsji/KX_WorldIpoController.h
View File

@@ -96,9 +96,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldIpoController")
#endif
};

4
source/gameengine/Network/NG_NetworkDeviceInterface.h
View File

@@ -75,9 +75,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkDeviceInterface")
#endif
};

4
source/gameengine/Network/NG_NetworkMessage.h
View File

@@ -131,9 +131,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkMessage")
#endif
};

4
source/gameengine/Network/NG_NetworkObject.h
View File

@@ -48,9 +48,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkObject")
#endif
};

4
source/gameengine/Network/NG_NetworkScene.h
View File

@@ -111,9 +111,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:NG_NetworkScene")
#endif
};

4
source/gameengine/Physics/Bullet/CcdGraphicController.h
View File

@@ -83,9 +83,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdGraphicController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CcdGraphicController")
#endif
};

12
source/gameengine/Physics/Bullet/CcdPhysicsController.h
View File

@@ -203,9 +203,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdShapeConstructionInfo"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CcdShapeConstructionInfo")
#endif
};
@@ -625,9 +623,7 @@ protected:
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CcdPhysicsController")
#endif
};
@@ -659,9 +655,7 @@ class DefaultMotionState : public PHY_IMotionState
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:DefaultMotionState"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:DefaultMotionState")
#endif
};

4
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
View File

@@ -288,9 +288,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CcdPhysicsEnvironment"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:CcdPhysicsEnvironment")
#endif
};

4
source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
View File

@@ -98,9 +98,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:DummyPhysicsEnvironment"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:DummyPhysicsEnvironment")
#endif
};

4
source/gameengine/Physics/common/PHY_IController.h
View File

@@ -56,9 +56,7 @@ class PHY_IController
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IController")
#endif
};

3
source/gameengine/Physics/common/PHY_IGraphicController.h
View File

@@ -54,8 +54,7 @@ class PHY_IGraphicController : public PHY_IController
virtual PHY_IGraphicController* GetReplica(class PHY_IMotionState* motionstate) {return 0;}
#ifdef WITH_CXX_GUARDEDALLOC
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IController")
#endif
};

4
source/gameengine/Physics/common/PHY_IMotionState.h
View File

@@ -61,9 +61,7 @@ class PHY_IMotionState
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IMotionState")
#endif
};

5
source/gameengine/Physics/common/PHY_IPhysicsController.h
View File

@@ -102,10 +102,9 @@ class PHY_IPhysicsController : public PHY_IController
PHY__Vector3 GetWorldPosition(PHY__Vector3& localpos);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IPhysicsController")
#endif
};

14
source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
View File

@@ -87,11 +87,10 @@ public:
m_faceUV(faceUV)
{
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IRayCastFilterCallback")
#endif
};
@@ -179,11 +178,10 @@ class PHY_IPhysicsEnvironment
virtual float getConstraintParam(int constraintId,int param) = 0;
virtual void exportFile(const char* filename) {};
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IPhysicsEnvironment")
#endif
};

4
source/gameengine/Physics/common/PHY_IVehicle.h
View File

@@ -62,9 +62,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:PHY_IVehicle")
#endif
};

8
source/gameengine/Rasterizer/RAS_2DFilterManager.h
View File

@@ -106,12 +106,10 @@ public:
void RenderFilters(RAS_ICanvas* canvas);
void EnableFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_2DFilterManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_2DFilterManager")
#endif
};
#endif

5
source/gameengine/Rasterizer/RAS_BucketManager.h
View File

@@ -84,10 +84,9 @@ private:
void RenderAlphaBuckets(const MT_Transform& cameratrans,
RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_BucketManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_BucketManager")
#endif
};

5
source/gameengine/Rasterizer/RAS_Deformer.h
View File

@@ -93,10 +93,9 @@ protected:
class RAS_MeshObject *m_pMesh;
bool m_bDynamic;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Deformer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_Deformer")
#endif
};

11
source/gameengine/Rasterizer/RAS_FramingManager.h
View File

@@ -163,9 +163,7 @@ private :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FrameSettings"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_FrameSettings")
#endif
};
@@ -300,14 +298,11 @@ private :
RAS_FramingManager(
const RAS_FramingManager &
);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_FramingManager"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_FramingManager")
#endif
};
#endif

7
source/gameengine/Rasterizer/RAS_ICanvas.h
View File

@@ -217,11 +217,10 @@ public:
protected:
RAS_MouseState m_mousestate;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ICanvas"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_ICanvas")
#endif
};

8
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
View File

@@ -185,12 +185,10 @@ public:
* PreCalculate texture gen
*/
virtual void OnConstruction(int layer){}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IPolyMaterial"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_IPolyMaterial")
#endif
};

8
source/gameengine/Rasterizer/RAS_IRasterizer.h
View File

@@ -416,12 +416,10 @@ public:
virtual void SetAnisotropicFiltering(short level)=0;
virtual short GetAnisotropicFiltering()=0;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRasterizer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_IRasterizer")
#endif
};

8
source/gameengine/Rasterizer/RAS_IRenderTools.h
View File

@@ -201,12 +201,10 @@ public:
virtual
void
MotionBlur(RAS_IRasterizer* rasterizer)=0;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_IRenderTools"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_IRenderTools")
#endif
};

17
source/gameengine/Rasterizer/RAS_MaterialBucket.h
View File

@@ -175,12 +175,10 @@ public:
bool IsCulled() { return m_bCulled; }
#endif
void SetCulled(bool culled) { m_bCulled = culled; }
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshSlot"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MeshSlot")
#endif
};
@@ -195,9 +193,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshMaterial"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MeshMaterial")
#endif
};
@@ -254,11 +250,8 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MaterialBucket"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MaterialBucket")
#endif
};
#endif //__RAS_MATERIAL_BUCKET

8
source/gameengine/Rasterizer/RAS_MeshObject.h
View File

@@ -170,12 +170,10 @@ public:
};
vector<vector<SharedVertex> > m_sharedvertex_map;
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_MeshObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_MeshObject")
#endif
};

8
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
View File

@@ -73,12 +73,10 @@ public:
virtual void SetDrawingMode(int drawingmode);
virtual bool QueryLists(){return true;}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_ListRasterizer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_ListRasterizer")
#endif
};

8
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
View File

@@ -315,12 +315,10 @@ public:
virtual void SetAnisotropicFiltering(short level);
virtual short GetAnisotropicFiltering();
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_OpenGLRasterizer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_OpenGLRasterizer")
#endif
};

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
View File

@@ -63,9 +63,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_VAOpenGLRasterizer"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_VAOpenGLRasterizer")
#endif
};

7
source/gameengine/Rasterizer/RAS_Polygon.h
View File

@@ -93,11 +93,10 @@ public:
RAS_MaterialBucket* GetMaterial();
RAS_DisplayArray* GetDisplayArray();
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Polygon"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_Polygon")
#endif
};

7
source/gameengine/Rasterizer/RAS_Rect.h
View File

@@ -94,11 +94,10 @@ public:
{
m_y2 = y2;
}
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_Rect"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_Rect")
#endif
};

7
source/gameengine/Rasterizer/RAS_TexVert.h
View File

@@ -141,11 +141,10 @@ public:
// compare two vertices, to test if they can be shared, used for
// splitting up based on uv's, colors, etc
bool closeTo(const RAS_TexVert* other);
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:RAS_TexVert"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:RAS_TexVert")
#endif
};

4
source/gameengine/SceneGraph/SG_BBox.h
View File

@@ -136,9 +136,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_BBox"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_BBox")
#endif
};

9
source/gameengine/SceneGraph/SG_Controller.h
View File

@@ -43,12 +43,6 @@
class SG_Controller
{
public:
#ifdef WITH_CXX_GUARDEDALLOC
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "SG_Controller"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
#endif
SG_Controller(
) :
m_pObject(NULL) {
@@ -122,6 +116,9 @@ public:
protected:
SG_IObject* m_pObject;
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Controller")
#endif
};
#endif //__SG_CONTROLLER_H__

4
source/gameengine/SceneGraph/SG_DList.h
View File

@@ -217,9 +217,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_DList"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_DList")
#endif
};

4
source/gameengine/SceneGraph/SG_IObject.h
View File

@@ -367,9 +367,7 @@ protected :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_IObject"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_IObject")
#endif
};

4
source/gameengine/SceneGraph/SG_Node.h
View File

@@ -271,9 +271,7 @@ private:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Node"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Node")
#endif
};

4
source/gameengine/SceneGraph/SG_ParentRelation.h
View File

@@ -131,9 +131,7 @@ protected :
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_ParentRelation"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_ParentRelation")
#endif
};

4
source/gameengine/SceneGraph/SG_QList.h
View File

@@ -157,9 +157,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_QList"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_QList")
#endif
};

4
source/gameengine/SceneGraph/SG_Spatial.h
View File

@@ -287,9 +287,7 @@ protected:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Spatial"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Spatial")
#endif
};

8
source/gameengine/SceneGraph/SG_Tree.h
View File

@@ -115,9 +115,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_Tree"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_Tree")
#endif
};
@@ -158,9 +156,7 @@ public:
#ifdef WITH_CXX_GUARDEDALLOC
public:
void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SG_TreeFactory"); }
void operator delete( void *mem ) { MEM_freeN(mem); }
MEM_CXX_CLASS_ALLOC_FUNCS("GE:SG_TreeFactory")
#endif
};