Reordered some of the includes to fix STL issues.

For details, see:
http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=5867

Kent
This commit is contained in:
Kent Mein 2005-03-22 13:34:31 +00:00
parent f0112406ed
commit af12eaae1f
8 changed files with 7 additions and 20 deletions

@ -33,6 +33,7 @@
#ifndef BL_ACTIONACTUATOR
#define BL_ACTIONACTUATOR
#include "GEN_HashedPtr.h"
#include "SCA_IActuator.h"
#include "MT_Point3.h"

@ -32,6 +32,7 @@
#ifndef __BLENDER_CONVERT
#define __BLENDER_CONVERT
#include "GEN_HashedPtr.h"
#include "STR_String.h"
#include "KX_Python.h"
#include "KX_PhysicsEngineEnums.h"

@ -30,21 +30,17 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WIN32
#pragma warning (disable : 4786)
#endif //WIN32
#include "BL_SkinDeformer.h"
#include "GEN_Map.h"
#include "STR_HashedString.h"
#include "RAS_IPolygonMaterial.h"
#include "BL_SkinMeshObject.h"
//#include "BL_ArmatureController.h"
#include "BL_SkinDeformer.h"
#include "DNA_armature_types.h"
#include "DNA_action_types.h"
#include "DNA_mesh_types.h"

@ -37,6 +37,7 @@
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
#include "GEN_HashedPtr.h"
#include "BL_MeshDeformer.h"
#include "BL_ArmatureObject.h"

@ -29,17 +29,13 @@
* ***** END GPL/BL DUAL LICENSE BLOCK *****
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif
#include "KX_Scene.h"
#include "KX_GameObject.h"
#include "KX_BlenderSceneConverter.h"
#include "KX_IpoConvert.h"
#include "RAS_MeshObject.h"
#include "KX_PhysicsEngineEnums.h"

@ -32,10 +32,10 @@
#ifndef __KX_BLENDERSCENECONVERTER_H
#define __KX_BLENDERSCENECONVERTER_H
#include "KX_HashedPtr.h"
#include "GEN_Map.h"
#include "KX_ISceneConverter.h"
#include "KX_HashedPtr.h"
#include "KX_IpoConvert.h"
class KX_WorldInfo;

@ -51,10 +51,6 @@
#include "KX_MotionState.h" // bridge between motionstate and scenegraph node
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef USE_ODE
#include "KX_OdePhysicsController.h"

@ -31,19 +31,15 @@
* Ketsji scene. Holds references to all scene data.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WIN32
#pragma warning (disable : 4786)
#endif //WIN32
#include "KX_Scene.h"
#include "MT_assert.h"
#include "KX_KetsjiEngine.h"
#include "RAS_IPolygonMaterial.h"
#include "KX_Scene.h"
#include "ListValue.h"
#include "SCA_LogicManager.h"
#include "SCA_TimeEventManager.h"