diff options
-rw-r--r-- | source/blender/blenkernel/BKE_armature.h | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 7 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 | ||||
-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 |
6 files changed, 9 insertions, 37 deletions
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h index e4802cfa37f..1334528c035 100644 --- a/source/blender/blenkernel/BKE_armature.h +++ b/source/blender/blenkernel/BKE_armature.h @@ -136,7 +136,6 @@ Mat4 *b_bone_spline_setup(struct bPoseChannel *pchan, int rest); /* like EBONE_VISIBLE */ #define PBONE_VISIBLE(arm, bone) (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P)) -#define _BONE_VISIBLE(arm, bone) (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P)) #ifdef __cplusplus } diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 85a2fd3dd91..b5fdb897d14 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -362,8 +362,11 @@ int imb_get_anim_type(const char * name) if (isredcode(name)) return (ANIM_REDCODE); #endif type = IMB_ispic(name); - if (type) return(ANIM_SEQUENCE); - return(0); + if (type) { + return ANIM_SEQUENCE; + } + + return ANIM_NONE; } int IMB_isanim(const char *filename) diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 817ebaf8012..e21ca52ecb3 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -640,10 +640,6 @@ typedef struct GameData { /* physicsEngine */ #define WOPHY_NONE 0 -#define WOPHY_ENJI 1 -#define WOPHY_SUMO 2 -#define WOPHY_DYNAMO 3 -#define WOPHY_ODE 4 #define WOPHY_BULLET 5 /* obstacleSimulation */ 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__ |