code cleanup: remove unused defines

This commit is contained in:
Campbell Barton 2012-04-23 08:05:02 +00:00
parent ceffa6e1fa
commit b9a2741f68
6 changed files with 9 additions and 37 deletions

View File

@ -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
}

View File

@ -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)

View File

@ -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 */

View File

@ -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;

View File

@ -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;

View File

@ -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__