diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-14 03:55:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-14 03:55:38 +0400 |
| commit | 5621e63d36c525f6acd744e2ddae3a73f2c3b453 (patch) | |
| tree | dcdf8d2a8a026a642db6e87d4cd8c692b36ecd8c /source/gameengine/Ketsji | |
| parent | d95b378c4dbf8caea5de382a38cedbff6a006ed3 (diff) | |
Code cleanup: duplicate headers
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 1 |
4 files changed, 0 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index 16513a97d60..ff5522ee7d2 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -49,7 +49,6 @@ #include "CTR_HashedPtr.h" #include "KX_PhysicsEngineEnums.h" -#include "PHY_Pro.h" #include "KX_MotionState.h" // bridge between motionstate and scenegraph node diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 8b7e6667fae..b6844a6900f 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -57,7 +57,6 @@ typedef unsigned long uint_ptr; #include "SG_Controller.h" #include "PHY_IGraphicController.h" #include "SG_Node.h" -#include "SG_Controller.h" #include "KX_ClientObjectInfo.h" #include "RAS_BucketManager.h" #include "KX_RayCast.h" diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 68fe735eb79..5d0c6a8bb83 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -142,8 +142,6 @@ extern "C" { #include "BKE_idcode.h" } -#include "NG_NetworkScene.h" //Needed for sendMessage() - // 'local' copy of canvas ptr, for window height/width python scripts #ifdef WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 4a147b4eb60..b66201f4b47 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1879,7 +1879,6 @@ static void MergeScene_LogicBrick(SCA_ILogicBrick* brick, KX_Scene *to) #ifdef WITH_BULLET #include "CcdGraphicController.h" // XXX ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); -#include "CcdPhysicsEnvironment.h" // XXX ctrl->SetPhysicsEnvironment(to->GetPhysicsEnvironment()); #endif static void MergeScene_GameObject(KX_GameObject* gameobj, KX_Scene *to, KX_Scene *from) |