From 6c4388e3b09678f360504d7740da82cfc68c6f35 Mon Sep 17 00:00:00 2001 From: Arystanbek Dyussenov Date: Tue, 27 Oct 2009 16:13:50 +0000 Subject: [PATCH] - fixed enum syntax in BKE_fcurve.h and ED_keyframing.h to make g++ happy - exporting addEditBone from armature module for COLLADA importer --- source/blender/blenkernel/BKE_fcurve.h | 4 ++-- source/blender/editors/include/ED_armature.h | 1 + source/blender/editors/include/ED_keyframing.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 94d0864024b..6e273c81e39 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -98,7 +98,7 @@ typedef struct FModifierTypeInfo { } FModifierTypeInfo; /* Values which describe the behaviour of a FModifier Type */ -enum { +typedef enum eFMI_Action_Types { /* modifier only modifies values outside of data range */ FMI_TYPE_EXTRAPOLATION = 0, /* modifier leaves data-points alone, but adjusts the interpolation between and around them */ @@ -110,7 +110,7 @@ enum { } eFMI_Action_Types; /* Flags for the requirements of a FModifier Type */ -enum { +typedef enum eFMI_Requirement_Flags { /* modifier requires original data-points (kindof beats the purpose of a modifier stack?) */ FMI_REQUIRES_ORIGINAL_DATA = (1<<0), /* modifier doesn't require on any preceeding data (i.e. it will generate a curve). diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index f360fd7a657..0204acd6fbe 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -112,6 +112,7 @@ EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, EditBone *ebo); / void ED_armature_sync_selection(struct ListBase *edbo); void add_primitive_bone(struct Scene *scene, struct View3D *v3d, struct RegionView3D *rv3d); +EditBone *addEditBone(struct bArmature *arm, char *name); /* used by COLLADA importer */ void transform_armature_mirror_update(struct Object *obedit); void clear_armature(struct Scene *scene, struct Object *ob, char mode); diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index 802ceff1c07..97a08845020 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -116,7 +116,7 @@ typedef struct bCommonKeySrc { /* -------- */ /* mode for modify_keyframes */ -enum { +typedef enum eModifyKey_Modes { MODIFYKEY_MODE_INSERT = 0, MODIFYKEY_MODE_DELETE, } eModifyKey_Modes; @@ -208,7 +208,7 @@ short id_frame_has_keyframe(struct ID *id, float frame, short filter); * WARNING: do not alter order of these, as also stored in files * (for v3d->keyflags) */ -enum { +typedef enum eAnimFilterFlags { /* general */ ANIMFILTER_KEYS_LOCAL = (1<<0), /* only include locally available anim data */ ANIMFILTER_KEYS_MUTED = (1<<1), /* include muted elements */