[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44367] trunk/blender/source/gameengine: use __ prefix on header guards to avoid mixing up defines with api functions / classes.
Campbell Barton
ideasman42 at gmail.com
Thu Feb 23 11:41:31 CET 2012
Revision: 44367
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44367
Author: campbellbarton
Date: 2012-02-23 10:41:31 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/BL_System.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
trunk/blender/source/gameengine/Converter/BL_ActionActuator.h
trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h
trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h
trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/BL_ModifierDeformer.h
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.h
trunk/blender/source/gameengine/Converter/KX_ConvertControllers.h
trunk/blender/source/gameengine/Converter/KX_ConvertProperties.h
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.h
trunk/blender/source/gameengine/Converter/KX_IpoConvert.h
trunk/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
trunk/blender/source/gameengine/Expressions/EXP_C-Api.h
trunk/blender/source/gameengine/Expressions/IdentifierExpr.h
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.h
trunk/blender/source/gameengine/Expressions/KX_Python.h
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
trunk/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_ANDController.h
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_ActuatorSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_AlwaysSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_BasicEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_DelaySensor.h
trunk/blender/source/gameengine/GameLogic/SCA_EventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_ExpressionController.h
trunk/blender/source/gameengine/GameLogic/SCA_IActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_IController.h
trunk/blender/source/gameengine/GameLogic/SCA_IInputDevice.h
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
trunk/blender/source/gameengine/GameLogic/SCA_IObject.h
trunk/blender/source/gameengine/GameLogic/SCA_IScene.h
trunk/blender/source/gameengine/GameLogic/SCA_ISensor.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardManager.h
trunk/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseManager.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_NANDController.h
trunk/blender/source/gameengine/GameLogic/SCA_NORController.h
trunk/blender/source/gameengine/GameLogic/SCA_ORController.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertyEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_PropertySensor.h
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.h
trunk/blender/source/gameengine/GameLogic/SCA_PythonKeyboard.h
trunk/blender/source/gameengine/GameLogic/SCA_PythonMouse.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomActuator.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
trunk/blender/source/gameengine/GameLogic/SCA_RandomSensor.h
trunk/blender/source/gameengine/GameLogic/SCA_TimeEventManager.h
trunk/blender/source/gameengine/GameLogic/SCA_XNORController.h
trunk/blender/source/gameengine/GameLogic/SCA_XORController.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_System.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_System.h
trunk/blender/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
trunk/blender/source/gameengine/Ketsji/BL_Action.h
trunk/blender/source/gameengine/Ketsji/BL_ActionManager.h
trunk/blender/source/gameengine/Ketsji/BL_BlenderShader.h
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
trunk/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
trunk/blender/source/gameengine/Ketsji/KX_ArmatureSensor.h
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_Camera.h
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.h
trunk/blender/source/gameengine/Ketsji/KX_CameraIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
trunk/blender/source/gameengine/Ketsji/KX_ConstraintActuator.h
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
trunk/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
trunk/blender/source/gameengine/Ketsji/KX_EmptyObject.h
trunk/blender/source/gameengine/Ketsji/KX_FontObject.h
trunk/blender/source/gameengine/Ketsji/KX_GameActuator.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_IInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_IPOTransform.h
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.h
trunk/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_IScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
trunk/blender/source/gameengine/Ketsji/KX_ISystem.h
trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_Light.h
trunk/blender/source/gameengine/Ketsji/KX_LightIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.h
trunk/blender/source/gameengine/Ketsji/KX_MotionState.h
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.h
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h
trunk/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.h
trunk/blender/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
trunk/blender/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
trunk/blender/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
trunk/blender/source/gameengine/Ketsji/KX_PositionInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_PyConstraintBinding.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.h
trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.h
trunk/blender/source/gameengine/Ketsji/KX_RayEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_RaySensor.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
trunk/blender/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
trunk/blender/source/gameengine/Ketsji/KX_ScalarInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_ScalingInterpolator.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.h
trunk/blender/source/gameengine/Ketsji/KX_StateActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
trunk/blender/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TimeLogger.h
trunk/blender/source/gameengine/Ketsji/KX_TouchEventManager.h
trunk/blender/source/gameengine/Ketsji/KX_TouchSensor.h
trunk/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
trunk/blender/source/gameengine/Ketsji/KX_VehicleWrapper.h
trunk/blender/source/gameengine/Ketsji/KX_VertexProxy.h
trunk/blender/source/gameengine/Ketsji/KX_VisibilityActuator.h
trunk/blender/source/gameengine/Ketsji/KX_WorldInfo.h
trunk/blender/source/gameengine/Ketsji/KX_WorldIpoController.h
trunk/blender/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
trunk/blender/source/gameengine/Network/NG_NetworkDeviceInterface.h
trunk/blender/source/gameengine/Network/NG_NetworkMessage.h
trunk/blender/source/gameengine/Network/NG_NetworkObject.h
trunk/blender/source/gameengine/Network/NG_NetworkScene.h
trunk/blender/source/gameengine/Physics/Bullet/CcdGraphicController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_DynamicTypes.h
trunk/blender/source/gameengine/Physics/common/PHY_IController.h
trunk/blender/source/gameengine/Physics/common/PHY_IGraphicController.h
trunk/blender/source/gameengine/Physics/common/PHY_IMotionState.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsController.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Physics/common/PHY_IVehicle.h
trunk/blender/source/gameengine/Physics/common/PHY_Pro.h
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_CameraData.h
trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
trunk/blender/source/gameengine/Rasterizer/RAS_FramingManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRenderTools.h
trunk/blender/source/gameengine/Rasterizer/RAS_LightObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_ObjectColor.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h
trunk/blender/source/gameengine/Rasterizer/RAS_Rect.h
trunk/blender/source/gameengine/Rasterizer/RAS_TexMatrix.h
trunk/blender/source/gameengine/Rasterizer/RAS_TexVert.h
trunk/blender/source/gameengine/SceneGraph/SG_Controller.h
trunk/blender/source/gameengine/SceneGraph/SG_DList.h
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
trunk/blender/source/gameengine/SceneGraph/SG_Node.h
trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h
trunk/blender/source/gameengine/SceneGraph/SG_QList.h
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.h
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_System.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_System.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_System.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -31,8 +31,8 @@
* \ingroup blroutines
*/
-#ifndef BL_SYSTEM_H
-#define BL_SYSTEM_H
+#ifndef __BL_SYSTEM_H__
+#define __BL_SYSTEM_H__
#ifdef __cplusplus
extern "C" {
@@ -66,5 +66,5 @@
}
#endif
-#endif /* BL_SYSTEM_H */
+#endif /* __BL_SYSTEM_H__ */
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __KX_BLENDERCANVAS
-#define __KX_BLENDERCANVAS
+#ifndef __KX_BLENDERCANVAS_H__
+#define __KX_BLENDERCANVAS_H__
#ifdef WIN32
#include <windows.h>
@@ -200,5 +200,5 @@
#endif
};
-#endif // __KX_BLENDERCANVAS
+#endif // __KX_BLENDERCANVAS_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __BLENDERGL
-#define __BLENDERGL
+#ifndef __KX_BLENDERGL_H__
+#define __KX_BLENDERGL_H__
#ifdef __cplusplus
extern "C" {
@@ -60,5 +60,5 @@
}
#endif //__cplusplus
-#endif //__BLENDERGL
+#endif //__KX_BLENDERGL_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __KX_BLENDERINPUTDEVICE
-#define __KX_BLENDERINPUTDEVICE
+#ifndef __KX_BLENDERINPUTDEVICE_H__
+#define __KX_BLENDERINPUTDEVICE_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning(disable : 4786) // shut off 255 char limit debug template warning
@@ -77,5 +77,5 @@
void operator delete(void *mem) { MEM_freeN(mem); }
#endif
};
-#endif //__KX_BLENDERINPUTDEVICE
+#endif //__KX_BLENDERINPUTDEVICE_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __KX_BLENDERKEYBOARDDEVICE
-#define __KX_BLENDERKEYBOARDDEVICE
+#ifndef __KX_BLENDERKEYBOARDDEVICE_H__
+#define __KX_BLENDERKEYBOARDDEVICE_H__
#include "KX_BlenderInputDevice.h"
@@ -61,5 +61,5 @@
#endif
};
-#endif //__KX_BLENDERKEYBOARDDEVICE
+#endif //__KX_BLENDERKEYBOARDDEVICE_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __KX_BLENDERMOUSEDEVICE
-#define __KX_BLENDERMOUSEDEVICE
+#ifndef __KX_BLENDERMOUSEDEVICE_H__
+#define __KX_BLENDERMOUSEDEVICE_H__
#include "KX_BlenderInputDevice.h"
@@ -57,5 +57,5 @@
#endif
};
-#endif //__KX_BLENDERMOUSEDEVICE
+#endif //__KX_BLENDERMOUSEDEVICE_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup blroutines
*/
-#ifndef __KX_BLENDERRENDERTOOLS
-#define __KX_BLENDERRENDERTOOLS
+#ifndef __KX_BLENDERRENDERTOOLS_H__
+#define __KX_BLENDERRENDERTOOLS_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show stl-warnings
@@ -114,7 +114,7 @@
#endif
};
-#endif //__KX_BLENDERRENDERTOOLS
+#endif //__KX_BLENDERRENDERTOOLS_H__
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -30,8 +30,8 @@
* \brief Blender System embedding. Needed when gameengine runs embedded within Blender.
*/
-#ifndef __KX_BLENDERSYSTEM
-#define __KX_BLENDERSYSTEM
+#ifndef __KX_BLENDERSYSTEM_H__
+#define __KX_BLENDERSYSTEM_H__
#include "KX_ISystem.h"
@@ -55,5 +55,5 @@
#endif
};
-#endif //__KX_BLENDERSYSTEM
+#endif //__KX_BLENDERSYSTEM_H__
Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ActionActuator.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef BL_ACTIONACTUATOR
-#define BL_ACTIONACTUATOR
+#ifndef __BL_ACTIONACTUATOR_H__
+#define __BL_ACTIONACTUATOR_H__
#include "CTR_HashedPtr.h"
#include "SCA_IActuator.h"
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureActuator.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef BL_ARMATUREACTUATOR
-#define BL_ARMATUREACTUATOR
+#ifndef __BL_ARMATUREACTUATOR_H__
+#define __BL_ARMATUREACTUATOR_H__
#include "SCA_IActuator.h"
#include "BL_ArmatureConstraint.h"
@@ -91,6 +91,6 @@
int m_type;
};
-#endif //BL_ARMATUREACTUATOR
+#endif //__BL_ARMATUREACTUATOR_H__
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef __BL_ARMATURECHANNEL
-#define __BL_ARMATURECHANNEL
+#ifndef __BL_ARMATURECHANNEL_H__
+#define __BL_ARMATURECHANNEL_H__
#include "DNA_action_types.h"
#include "CTR_HashedPtr.h"
@@ -94,5 +94,5 @@
};
-#endif //__BL_ARMATURECHANNEL
+#endif //__BL_ARMATURECHANNEL_H__
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureConstraint.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef __BL_ARMATURECONSTRAINT
-#define __BL_ARMATURECONSTRAINT
+#ifndef __BL_ARMATURECONSTRAINT_H__
+#define __BL_ARMATURECONSTRAINT_H__
#include "DNA_constraint_types.h"
#include "CTR_HashedPtr.h"
@@ -117,5 +117,5 @@
#endif // WITH_PYTHON
};
-#endif //__BL_ARMATURECONSTRAINT
+#endif //__BL_ARMATURECONSTRAINT_H__
Modified: trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef BL_ARMATUREOBJECT
-#define BL_ARMATUREOBJECT
+#ifndef __BL_ARMATUREOBJECT_H__
+#define __BL_ARMATUREOBJECT_H__
#include "KX_GameObject.h"
#include "BL_ArmatureConstraint.h"
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef __BLENDER_CONVERT
-#define __BLENDER_CONVERT
+#ifndef __BL_BLENDERDATACONVERSION_H__
+#define __BL_BLENDERDATACONVERSION_H__
#include "CTR_HashedPtr.h"
#include "STR_String.h"
@@ -52,5 +52,5 @@
SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code);
-#endif // __BLENDER_CONVERT
+#endif // __BL_BLENDERDATACONVERSION_H__
Modified: trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h 2012-02-23 10:35:23 UTC (rev 44366)
+++ trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h 2012-02-23 10:41:31 UTC (rev 44367)
@@ -29,8 +29,8 @@
* \ingroup bgeconv
*/
-#ifndef BL_DEFORMABLEGAMEOBJECT
-#define BL_DEFORMABLEGAMEOBJECT
+#ifndef __BL_DEFORMABLEGAMEOBJECT_H__
+#define __BL_DEFORMABLEGAMEOBJECT_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
Modified: trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list