[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48264] branches/soc-2011-tomato: Merging r48257 through r48263 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Mon Jun 25 12:57:02 CEST 2012


Revision: 48264
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48264
Author:   nazgul
Date:     2012-06-25 10:56:48 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Merging r48257 through r48263 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48257
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48263

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/intern/ghost/GHOST_IEvent.h
    branches/soc-2011-tomato/intern/ghost/GHOST_IEventConsumer.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ITimerTask.h
    branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
    branches/soc-2011-tomato/intern/ghost/GHOST_Rect.h
    branches/soc-2011-tomato/intern/ghost/GHOST_Types.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_CallbackEventConsumer.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowManager.h
    branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2011-tomato/intern/guardedalloc/cpp/mallocn.cpp
    branches/soc-2011-tomato/intern/string/STR_String.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Converter.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Device.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystem.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeBase.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_Socket.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketConnection.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_SocketReader.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkPackage.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.h
    branches/soc-2011-tomato/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2011-tomato/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2011-tomato/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/soc-2011-tomato/source/gameengine/Expressions/BoolValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/ConstExpr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/EmptyValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/ErrorValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/Expression.h
    branches/soc-2011-tomato/source/gameengine/Expressions/FloatValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/IdentifierExpr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/IfExpr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/InputParser.h
    branches/soc-2011-tomato/source/gameengine/Expressions/IntValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/Operator1Expr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/Operator2Expr.h
    branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-tomato/source/gameengine/Expressions/StringValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/Value.h
    branches/soc-2011-tomato/source/gameengine/Expressions/VectorValue.h
    branches/soc-2011-tomato/source/gameengine/Expressions/VoidValue.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Action.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_ActionManager.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_FontObject.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ISystem.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MaterialIpoController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RayCast.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkObject.h
    branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkScene.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2011-tomato/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_Rect.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Controller.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Spatial.h
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Tree.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48256
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48263

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-06-25 10:56:48 UTC (rev 48264)
@@ -1766,6 +1766,7 @@
 # better not set includes here but this debugging option is off by default.
 if(WITH_CXX_GUARDEDALLOC)
 	include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
+	add_definitions(-DWITH_CXX_GUARDEDALLOC)
 endif()
 
 if(WITH_ASSERT_ABORT)

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_IEvent.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_IEvent.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_IEvent.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -86,13 +86,7 @@
 	virtual GHOST_TEventDataPtr getData() = 0;
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) {
-		return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent");
-	}
-	void operator delete(void *mem) {
-		MEM_freeN(mem);
-	}
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEvent")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_IEventConsumer.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_IEventConsumer.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_IEventConsumer.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -64,9 +64,7 @@
 	virtual bool processEvent(GHOST_IEvent *event) = 0;
 	
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEventConsumer"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IEventConsumer")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -415,14 +415,9 @@
 	/** The one and only system */
 	static GHOST_ISystem *m_system;
 
+
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) {
-		return MEM_mallocN(num_bytes, "GHOST:GHOST_ISystem");
-	}
-	void operator delete(void *mem) {
-		MEM_freeN(mem);
-	}
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ISystem")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_ISystemPaths.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -98,6 +98,11 @@
 private:
 	/** The one and only system paths*/
 	static GHOST_ISystemPaths *m_systemPaths;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ISystemPaths")
+#endif
 };
 
 #endif

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_ITimerTask.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_ITimerTask.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_ITimerTask.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -84,14 +84,9 @@
 	 */
 	virtual void setUserData(const GHOST_TUserDataPtr userData) = 0;
 
+
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) {
-		return MEM_mallocN(num_bytes, "GHOST:GHOST_ITimerTask");
-	}
-	void operator delete(void *mem) {
-		MEM_freeN(mem);
-	}
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_ITimerTask")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_IWindow.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -306,9 +306,7 @@
 	virtual GHOST_TSuccess setCursorGrab(GHOST_TGrabCursorMode mode, GHOST_Rect *bounds) { return GHOST_kSuccess; }
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IWindow"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_IWindow")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_Rect.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_Rect.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_Rect.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -190,9 +190,7 @@
 	GHOST_TInt32 m_b;
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_Rect"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_Rect")
 #endif
 };
 

Modified: branches/soc-2011-tomato/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/GHOST_Types.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/GHOST_Types.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -37,7 +37,11 @@
 #include "MEM_guardedalloc.h"
 #endif
 
-#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
+#if defined(WITH_CXX_GUARDEDALLOC) && defined(__cplusplus)
+#  define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; MEM_CXX_CLASS_ALLOC_FUNCS(#name) } *name
+#else
+#  define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
+#endif
 
 typedef char GHOST_TInt8;
 typedef unsigned char GHOST_TUns8;

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_CallbackEventConsumer.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_CallbackEventConsumer.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_CallbackEventConsumer.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -73,6 +73,10 @@
 	GHOST_EventCallbackProcPtr m_eventCallback;
 	/** The data passed back though the call-back routine. */
 	GHOST_TUserDataPtr m_userData;
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_CallbackEventConsumer")
+#endif
 };
 
 #endif // __GHOST_CALLBACKEVENTCONSUMER_H__

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_DisplayManager.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -133,6 +133,11 @@
 	bool m_settingsInitialized;
 	/** The list with display settings for the main display. */
 	std::vector<GHOST_DisplaySettings> m_settings;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_DisplayManager")
+#endif
 };
 
 

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -168,6 +168,11 @@
 
 	/** The list with event consumers. */
 	TConsumerVector m_consumers;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_EventManager")
+#endif
 };
 
 #endif // __GHOST_EVENTMANAGER_H__

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPaths.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -57,7 +57,7 @@
 	 */
 	virtual const GHOST_TUns8 *getSystemDir(int version, const char *versionstr) const = 0;
 
-    /**
+	/**
 	  * Determine the base dir in which user configuration is stored, including versioning.
 	  * If needed, it will create the base directory.
 	  * @return Unsigned char string pointing to user dir (eg ~/.blender/).
@@ -74,7 +74,6 @@
 	 * Add the file to the operating system most recently used files
 	 */
 	virtual void addToSystemRecentFiles(const char *filename) const = 0;
-
 };
 
 #endif

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.h
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.h	2012-06-25 10:50:24 UTC (rev 48263)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_TimerManager.h	2012-06-25 10:56:48 UTC (rev 48264)
@@ -119,6 +119,11 @@
 	typedef std::vector<GHOST_TimerTask *> TTimerVector;
 	/** The list with event consumers. */
 	TTimerVector m_timers;
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+	MEM_CXX_CLASS_ALLOC_FUNCS("GHOST:GHOST_TimerManager")
+#endif
 };
 
 #endif // __GHOST_TIMERMANAGER_H__

Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowManager.h
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list