diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 12:05:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-23 12:05:02 +0400 |
| commit | b9a2741f68c46fdf86d19eef845b803f9e96b1d9 (patch) | |
| tree | 3acf958e19890b5430de63e4fc6eae8ec76f77db /source/gameengine | |
| parent | ceffa6e1fab2b4b1388458bcf7c735e2783f90d8 (diff) | |
code cleanup: remove unused defines
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 24 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PhysicsEngineEnums.h | 6 |
3 files changed, 4 insertions, 30 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 4c7170c4c9e..382165065af 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1839,10 +1839,6 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj, break; #endif - case UseDynamo: - //KX_ConvertDynamoObject(gameobj,meshobj,kxscene,shapeprops, smmaterial, &objprop); - break; - case UseNone: default: break; diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index bbb990462bd..df6be142b30 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -308,25 +308,11 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene, useDbvtCulling = (blenderscene->gm.mode & WO_DBVT_CULLING) != 0; break; } - - case WOPHY_ODE: - { - physics_engine = UseODE; - break; - } - case WOPHY_DYNAMO: - { - physics_engine = UseDynamo; - break; - } - case WOPHY_SUMO: - { - physics_engine = UseSumo; - break; - } + default: case WOPHY_NONE: { physics_engine = UseNone; + break; } } } @@ -352,11 +338,7 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene, destinationscene->SetPhysicsEnvironment(ccdPhysEnv); break; } -#endif - case UseDynamo: - { - } - +#endif default: case UseNone: physics_engine = UseNone; diff --git a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h index f20bab578d1..5cebedf8c30 100644 --- a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h +++ b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h @@ -36,11 +36,7 @@ enum e_PhysicsEngine { NoSelection = -1, UseNone = 0, - UseEnji = 1, - UseSumo = 2, - UseDynamo = 3, - UseODE = 4, - UseBullet = 5, + UseBullet = 5, }; #endif //__KX_PHYSICSENGINEENUMS_H__ |