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/blender | |
| parent | ceffa6e1fab2b4b1388458bcf7c735e2783f90d8 (diff) | |
code cleanup: remove unused defines
Diffstat (limited to 'source/blender')
| -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 |
3 files changed, 5 insertions, 7 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 */ |