archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: remove unused defines

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_armature.h
View File

@@ -136,7 +136,6 @@ Mat4 *b_bone_spline_setup(struct bPoseChannel *pchan, int rest);
/* like EBONE_VISIBLE */ /* like EBONE_VISIBLE */
#define PBONE_VISIBLE(arm, bone) (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P)) #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 #ifdef __cplusplus
} }

7
source/blender/imbuf/intern/util.c
View File

@@ -362,8 +362,11 @@ int imb_get_anim_type(const char * name)
if (isredcode(name)) return (ANIM_REDCODE); if (isredcode(name)) return (ANIM_REDCODE);
#endif #endif
type = IMB_ispic(name); type = IMB_ispic(name);
if (type) return(ANIM_SEQUENCE); if (type) {
return(0); return ANIM_SEQUENCE;
}
return ANIM_NONE;
} }
int IMB_isanim(const char *filename) int IMB_isanim(const char *filename)

4
source/blender/makesdna/DNA_scene_types.h
View File

@@ -640,10 +640,6 @@ typedef struct GameData {
/* physicsEngine */ /* physicsEngine */
#define WOPHY_NONE 0 #define WOPHY_NONE 0
#define WOPHY_ENJI 1
#define WOPHY_SUMO 2
#define WOPHY_DYNAMO 3
#define WOPHY_ODE 4
#define WOPHY_BULLET 5 #define WOPHY_BULLET 5
/* obstacleSimulation */ /* obstacleSimulation */

4
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@@ -1839,10 +1839,6 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
break; break;
#endif #endif
case UseDynamo:
//KX_ConvertDynamoObject(gameobj,meshobj,kxscene,shapeprops, smmaterial, &objprop);
break;
case UseNone: case UseNone:
default: default:
break; break;

22
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@@ -308,25 +308,11 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
useDbvtCulling = (blenderscene->gm.mode & WO_DBVT_CULLING) != 0; useDbvtCulling = (blenderscene->gm.mode & WO_DBVT_CULLING) != 0;
break; break;
} }
default:
case WOPHY_ODE:
{
physics_engine = UseODE;
break;
}
case WOPHY_DYNAMO:
{
physics_engine = UseDynamo;
break;
}
case WOPHY_SUMO:
{
physics_engine = UseSumo;
break;
}
case WOPHY_NONE: case WOPHY_NONE:
{ {
physics_engine = UseNone; physics_engine = UseNone;
break;
} }
} }
} }
@@ -353,10 +339,6 @@ void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
break; break;
} }
#endif #endif
case UseDynamo:
{
}
default: default:
case UseNone: case UseNone:
physics_engine = UseNone; physics_engine = UseNone;

6
source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
View File

@@ -36,11 +36,7 @@ enum e_PhysicsEngine
{ {
NoSelection = -1, NoSelection = -1,
UseNone = 0, UseNone = 0,
UseEnji = 1, UseBullet = 5,
UseSumo = 2,
UseDynamo = 3,
UseODE = 4,
UseBullet = 5,
}; };
#endif //__KX_PHYSICSENGINEENUMS_H__ #endif //__KX_PHYSICSENGINEENUMS_H__