tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

- fixed enum syntax in BKE_fcurve.h and ED_keyframing.h to make g++ happy 

- exporting addEditBone from armature module for COLLADA importer
This commit is contained in:
Arystanbek Dyussenov 2009-10-27 16:13:50 +00:00
parent d160891c36
commit 6c4388e3b0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_fcurve.h
View File

@ -98,7 +98,7 @@ typedef struct FModifierTypeInfo {
} FModifierTypeInfo; } FModifierTypeInfo;
/* Values which describe the behaviour of a FModifier Type */ /* Values which describe the behaviour of a FModifier Type */
enum { typedef enum eFMI_Action_Types {
/* modifier only modifies values outside of data range */ /* modifier only modifies values outside of data range */
FMI_TYPE_EXTRAPOLATION = 0, FMI_TYPE_EXTRAPOLATION = 0,
/* modifier leaves data-points alone, but adjusts the interpolation between and around them */ /* modifier leaves data-points alone, but adjusts the interpolation between and around them */
@ -110,7 +110,7 @@ enum {
} eFMI_Action_Types; } eFMI_Action_Types;
/* Flags for the requirements of a FModifier Type */ /* 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?) */ /* modifier requires original data-points (kindof beats the purpose of a modifier stack?) */
FMI_REQUIRES_ORIGINAL_DATA = (1<<0), FMI_REQUIRES_ORIGINAL_DATA = (1<<0),
/* modifier doesn't require on any preceeding data (i.e. it will generate a curve). /* modifier doesn't require on any preceeding data (i.e. it will generate a curve).

1
source/blender/editors/include/ED_armature.h
View File

@ -112,6 +112,7 @@ EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, EditBone *ebo); /
void ED_armature_sync_selection(struct ListBase *edbo); void ED_armature_sync_selection(struct ListBase *edbo);
void add_primitive_bone(struct Scene *scene, struct View3D *v3d, struct RegionView3D *rv3d); 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 transform_armature_mirror_update(struct Object *obedit);
void clear_armature(struct Scene *scene, struct Object *ob, char mode); void clear_armature(struct Scene *scene, struct Object *ob, char mode);

4
source/blender/editors/include/ED_keyframing.h
View File

@ -116,7 +116,7 @@ typedef struct bCommonKeySrc {
/* -------- */ /* -------- */
/* mode for modify_keyframes */ /* mode for modify_keyframes */
enum { typedef enum eModifyKey_Modes {
MODIFYKEY_MODE_INSERT = 0, MODIFYKEY_MODE_INSERT = 0,
MODIFYKEY_MODE_DELETE, MODIFYKEY_MODE_DELETE,
} eModifyKey_Modes; } 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 * WARNING: do not alter order of these, as also stored in files
* (for v3d->keyflags) * (for v3d->keyflags)
*/ */
enum { typedef enum eAnimFilterFlags {
/* general */ /* general */
ANIMFILTER_KEYS_LOCAL = (1<<0), /* only include locally available anim data */ ANIMFILTER_KEYS_LOCAL = (1<<0), /* only include locally available anim data */
ANIMFILTER_KEYS_MUTED = (1<<1), /* include muted elements */ ANIMFILTER_KEYS_MUTED = (1<<1), /* include muted elements */