diff options
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 1322 |
1 files changed, 661 insertions, 661 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index d63d5ae2082..6ba61830cd9 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -80,10 +80,10 @@ // XXX constant defines to be moved elsewhere? /* extra padding for lengths (to go under scrollers) */ -#define EXTRA_SCROLL_PAD 100.0f +#define EXTRA_SCROLL_PAD 100.0f /* size of indent steps */ -#define INDENT_STEP_SIZE 7 +#define INDENT_STEP_SIZE 7 #define ANIM_CHAN_NAME_SIZE 256 @@ -108,10 +108,10 @@ static void acf_generic_root_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUS /* backdrop for top-level widgets (Scene and Object only) */ static void acf_generic_root_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; - short expanded= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0; - short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; + short expanded = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0; + short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0; float color[3]; /* set backdrop drawing color */ @@ -120,7 +120,7 @@ static void acf_generic_root_backdrop(bAnimContext *ac, bAnimListElem *ale, floa /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */ uiSetRoundBox(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)); - uiDrawBox(GL_POLYGON, offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8); + uiDrawBox(GL_POLYGON, offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8); } @@ -134,9 +134,9 @@ static void acf_generic_dataexpand_color(bAnimContext *UNUSED(ac), bAnimListElem /* backdrop for data expanders under top-level Scene/Object */ static void acf_generic_dataexpand_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; - short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; + short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0; float color[3]; /* set backdrop drawing color */ @@ -144,24 +144,24 @@ static void acf_generic_dataexpand_backdrop(bAnimContext *ac, bAnimListElem *ale glColor3fv(color); /* no rounded corner - just rectangular box */ - glRectf(offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc); + glRectf(offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc); } /* get backdrop color for generic channels */ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, float r_color[3]) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); SpaceAction *saction = NULL; bActionGroup *grp = NULL; - short indent= (acf->get_indent_level) ? acf->get_indent_level(ac, ale) : 0; + short indent = (acf->get_indent_level) ? acf->get_indent_level(ac, ale) : 0; /* get context info needed... */ if ((ac->sl) && (ac->spacetype == SPACE_ACTION)) - saction= (SpaceAction *)ac->sl; + saction = (SpaceAction *)ac->sl; if (ale->type == ANIMTYPE_FCURVE) { - FCurve *fcu= (FCurve *)ale->data; - grp= fcu->grp; + FCurve *fcu = (FCurve *)ale->data; + grp = fcu->grp; } /* set color for normal channels @@ -169,7 +169,7 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa * - only use group colors if allowed to, and if actually feasible */ if ( (saction && !(saction->flag & SACTION_NODRAWGCOLORS)) && - ((grp) && (grp->customCol)) ) + ((grp) && (grp->customCol)) ) { unsigned char cp[3]; @@ -188,7 +188,7 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa } else { // FIXME: what happens when the indention is 1 greater than what it should be (due to grouping)? - int colOfs= 20 - 20*indent; + int colOfs = 20 - 20 * indent; UI_GetThemeColorShade3fv(TH_HEADER, colOfs, r_color); } } @@ -196,9 +196,9 @@ static void acf_generic_channel_color(bAnimContext *ac, bAnimListElem *ale, floa /* backdrop for generic channels */ static void acf_generic_channel_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; - short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; + short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0; float color[3]; /* set backdrop drawing color */ @@ -206,7 +206,7 @@ static void acf_generic_channel_backdrop(bAnimContext *ac, bAnimListElem *ale, f glColor3fv(color); /* no rounded corners - just rectangular box */ - glRectf(offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc); + glRectf(offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc); } /* Indention + Offset ------------------------------------------- */ @@ -230,11 +230,11 @@ static short acf_generic_indention_2(bAnimContext *ac, bAnimListElem *ale) /* indention which varies with the grouping status */ static short acf_generic_indention_flexible(bAnimContext *UNUSED(ac), bAnimListElem *ale) { - short indent= 0; + short indent = 0; /* grouped F-Curves need extra level of indention */ if (ale->type == ANIMTYPE_FCURVE) { - FCurve *fcu= (FCurve *)ale->data; + FCurve *fcu = (FCurve *)ale->data; // TODO: we need some way of specifying that the indention color should be one less... if (fcu->grp) @@ -248,7 +248,7 @@ static short acf_generic_indention_flexible(bAnimContext *UNUSED(ac), bAnimListE /* basic offset for channels derived from indention */ static short acf_generic_basic_offset(bAnimContext *ac, bAnimListElem *ale) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); if (acf && acf->get_indent_level) return acf->get_indent_level(ac, ale) * INDENT_STEP_SIZE; @@ -273,7 +273,7 @@ static short acf_nodetree_rootType_offset(bNodeTree *ntree) case NTREE_TEXTURE: /* 2 additional levels */ - return INDENT_STEP_SIZE*2; + return INDENT_STEP_SIZE * 2; } } @@ -284,7 +284,7 @@ static short acf_nodetree_rootType_offset(bNodeTree *ntree) /* offset for groups + grouped entities */ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale) { - short offset= acf_generic_basic_offset(ac, ale); + short offset = acf_generic_basic_offset(ac, ale); if (ale->id) { /* texture animdata */ @@ -301,7 +301,7 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale) /* nodetree animdata */ if (GS(ale->id->name) == ID_NT) { - offset += acf_nodetree_rootType_offset((bNodeTree*)ale->id); + offset += acf_nodetree_rootType_offset((bNodeTree *)ale->id); } } @@ -314,11 +314,11 @@ static short acf_generic_group_offset(bAnimContext *ac, bAnimListElem *ale) /* name for ID block entries */ static void acf_generic_idblock_name(bAnimListElem *ale, char *name) { - ID *id= (ID *)ale->data; /* data pointed to should be an ID block */ + ID *id = (ID *)ale->data; /* data pointed to should be an ID block */ /* just copy the name... */ if (id && name) - BLI_strncpy(name, id->name+2, ANIM_CHAN_NAME_SIZE); + BLI_strncpy(name, id->name + 2, ANIM_CHAN_NAME_SIZE); } /* name property for ID block entries */ @@ -378,7 +378,7 @@ static short acf_generic_dataexpand_setting_valid(bAnimContext *ac, bAnimListEle static void acf_summary_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), float r_color[3]) { // FIXME: hardcoded color - same as the 'action' line in NLA - // reddish color + // reddish color r_color[0] = 0.8f; r_color[1] = 0.2f; r_color[2] = 0.0f; @@ -387,8 +387,8 @@ static void acf_summary_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(al /* backdrop for summary widget */ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; float color[3]; /* set backdrop drawing color */ @@ -400,7 +400,7 @@ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float ymi * - special hack: make the top a bit higher, since we are first... */ uiSetRoundBox(UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT); - uiDrawBox(GL_POLYGON, 0, yminc-2, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8); + uiDrawBox(GL_POLYGON, 0, yminc - 2, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8); } /* name for summary entries */ @@ -428,12 +428,12 @@ static int acf_summary_setting_flag(bAnimContext *UNUSED(ac), int setting, short { if (setting == ACHANNEL_SETTING_EXPAND) { /* expanded */ - *neg= 1; + *neg = 1; return ADS_FLAG_SUMMARY_COLLAPSED; } else { /* unsupported */ - *neg= 0; + *neg = 0; return 0; } } @@ -441,21 +441,21 @@ static int acf_summary_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *type) { - bAnimContext *ac= (bAnimContext *)ale->data; + bAnimContext *ac = (bAnimContext *)ale->data; /* if data is valid, return pointer to active dopesheet's relevant flag * - this is restricted to DopeSheet/Action Editor only */ if ((ac->sl) && (ac->spacetype == SPACE_ACTION) && (setting == ACHANNEL_SETTING_EXPAND)) { - SpaceAction *saction= (SpaceAction *)ac->sl; - bDopeSheet *ads= &saction->ads; + SpaceAction *saction = (SpaceAction *)ac->sl; + bDopeSheet *ads = &saction->ads; /* return pointer to DopeSheet's flag */ return GET_ACF_FLAG_PTR(ads->flag, type); } else { /* can't return anything useful - unsupported */ - *type= 0; + *type = 0; return NULL; } } @@ -463,20 +463,20 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ /* all animation summary (DopeSheet only) type define */ static bAnimChannelType ACF_SUMMARY = { - "Summary", /* type name */ + "Summary", /* type name */ - acf_summary_color, /* backdrop color */ - acf_summary_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - NULL, /* offset */ - - acf_summary_name, /* name */ - NULL, /* name prop */ - acf_summary_icon, /* icon */ - - acf_summary_setting_valid, /* has setting */ - acf_summary_setting_flag, /* flag for setting */ - acf_summary_setting_ptr /* pointer for setting */ + acf_summary_color, /* backdrop color */ + acf_summary_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + NULL, /* offset */ + + acf_summary_name, /* name */ + NULL, /* name prop */ + acf_summary_icon, /* icon */ + + acf_summary_setting_valid, /* has setting */ + acf_summary_setting_flag, /* flag for setting */ + acf_summary_setting_ptr /* pointer for setting */ }; /* Scene ------------------------------------------- */ @@ -513,21 +513,21 @@ static short acf_scene_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale static int acf_scene_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ return SCE_DS_SELECTED; case ACHANNEL_SETTING_EXPAND: /* expanded */ - *neg= 1; + *neg = 1; return SCE_DS_COLLAPSED; case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */ return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; default: /* unsupported */ @@ -538,10 +538,10 @@ static int acf_scene_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_scene_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Scene *scene= (Scene *)ale->data; + Scene *scene = (Scene *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -565,28 +565,28 @@ static void *acf_scene_setting_ptr(bAnimListElem *ale, int setting, short *type) /* scene type define */ static bAnimChannelType ACF_SCENE = { - "Scene", /* type name */ + "Scene", /* type name */ - acf_generic_root_color, /* backdrop color */ - acf_generic_root_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - NULL, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_scene_icon, /* icon */ - - acf_scene_setting_valid, /* has setting */ - acf_scene_setting_flag, /* flag for setting */ - acf_scene_setting_ptr /* pointer for setting */ + acf_generic_root_color, /* backdrop color */ + acf_generic_root_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + NULL, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_scene_icon, /* icon */ + + acf_scene_setting_valid, /* has setting */ + acf_scene_setting_flag, /* flag for setting */ + acf_scene_setting_ptr /* pointer for setting */ }; /* Object ------------------------------------------- */ static int acf_object_icon(bAnimListElem *ale) { - Base *base= (Base *)ale->data; - Object *ob= base->object; + Base *base = (Base *)ale->data; + Object *ob = base->object; /* icon depends on object-type */ @@ -622,19 +622,19 @@ static int acf_object_icon(bAnimListElem *ale) /* name for object */ static void acf_object_name(bAnimListElem *ale, char *name) { - Base *base= (Base *)ale->data; - Object *ob= base->object; + Base *base = (Base *)ale->data; + Object *ob = base->object; /* just copy the name... */ if (ob && name) - BLI_strncpy(name, ob->id.name+2, ANIM_CHAN_NAME_SIZE); + BLI_strncpy(name, ob->id.name + 2, ANIM_CHAN_NAME_SIZE); } /* check if some setting exists for this channel */ static short acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, int setting) { - Base *base= (Base *)ale->data; - Object *ob= base->object; + Base *base = (Base *)ale->data; + Object *ob = base->object; switch (setting) { /* muted only in NLA */ @@ -659,21 +659,21 @@ static short acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, int static int acf_object_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ return SELECT; case ACHANNEL_SETTING_EXPAND: /* expanded */ - *neg= 1; + *neg = 1; return OB_ADS_COLLAPSED; case ACHANNEL_SETTING_MUTE: /* mute (only in NLA) */ return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; default: /* unsupported */ @@ -684,11 +684,11 @@ static int acf_object_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_object_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Base *base= (Base *)ale->data; - Object *ob= base->object; + Base *base = (Base *)ale->data; + Object *ob = base->object; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -712,20 +712,20 @@ static void *acf_object_setting_ptr(bAnimListElem *ale, int setting, short *type /* object type define */ static bAnimChannelType ACF_OBJECT = { - "Object", /* type name */ - - acf_generic_root_color, /* backdrop color */ - acf_generic_root_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - NULL, /* offset */ + "Object", /* type name */ - acf_object_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_object_icon, /* icon */ - - acf_object_setting_valid, /* has setting */ - acf_object_setting_flag, /* flag for setting */ - acf_object_setting_ptr /* pointer for setting */ + acf_generic_root_color, /* backdrop color */ + acf_generic_root_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + NULL, /* offset */ + + acf_object_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_object_icon, /* icon */ + + acf_object_setting_valid, /* has setting */ + acf_object_setting_flag, /* flag for setting */ + acf_object_setting_ptr /* pointer for setting */ }; /* Group ------------------------------------------- */ @@ -743,10 +743,10 @@ static void acf_group_color(bAnimContext *UNUSED(ac), bAnimListElem *ale, float /* backdrop for group widget */ static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; - short expanded= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0; - short offset= (acf->get_offset) ? acf->get_offset(ac, ale) : 0; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; + short expanded = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_EXPAND) != 0; + short offset = (acf->get_offset) ? acf->get_offset(ac, ale) : 0; float color[3]; /* set backdrop drawing color */ @@ -755,13 +755,13 @@ static void acf_group_backdrop(bAnimContext *ac, bAnimListElem *ale, float yminc /* rounded corners on LHS only - top only when expanded, but bottom too when collapsed */ uiSetRoundBox(expanded ? UI_CNR_TOP_LEFT : (UI_CNR_TOP_LEFT | UI_CNR_BOTTOM_LEFT)); - uiDrawBox(GL_POLYGON, offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc, 8); + uiDrawBox(GL_POLYGON, offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc, 8); } /* name for group entries */ static void acf_group_name(bAnimListElem *ale, char *name) { - bActionGroup *agrp= (bActionGroup *)ale->data; + bActionGroup *agrp = (bActionGroup *)ale->data; /* just copy the name... */ if (agrp && name) @@ -783,7 +783,7 @@ static short acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale /* for now, all settings are supported, though some are only conditionally */ switch (setting) { case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ - return (ac->spacetype==SPACE_IPO); + return (ac->spacetype == SPACE_IPO); default: /* always supported */ return 1; @@ -794,7 +794,7 @@ static short acf_group_setting_valid(bAnimContext *ac, bAnimListElem *UNUSED(ale static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -807,8 +807,8 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg) * proved to be a hazard for workflows... */ return (ac->spacetype == SPACE_IPO) ? - AGRP_EXPANDED_G : /* Graph Editor case */ - AGRP_EXPANDED; /* DopeSheet and elsewhere */ + AGRP_EXPANDED_G : /* Graph Editor case */ + AGRP_EXPANDED; /* DopeSheet and elsewhere */ } case ACHANNEL_SETTING_MUTE: /* muted */ @@ -819,7 +819,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg) return AGRP_PROTECTED; case ACHANNEL_SETTING_VISIBLE: /* visiblity - graph editor */ - *neg= 1; + *neg = 1; return AGRP_NOTVISIBLE; } @@ -830,7 +830,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg) /* get pointer to the setting */ static void *acf_group_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type) { - bActionGroup *agrp= (bActionGroup *)ale->data; + bActionGroup *agrp = (bActionGroup *)ale->data; /* all flags are just in agrp->flag for now... */ return GET_ACF_FLAG_PTR(agrp->flag, type); @@ -839,20 +839,20 @@ static void *acf_group_setting_ptr(bAnimListElem *ale, int UNUSED(setting), shor /* group type define */ static bAnimChannelType ACF_GROUP = { - "Group", /* type name */ - - acf_group_color, /* backdrop color */ - acf_group_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - acf_generic_group_offset, /* offset */ + "Group", /* type name */ - acf_group_name, /* name */ - acf_group_name_prop, /* name prop */ - NULL, /* icon */ - - acf_group_setting_valid, /* has setting */ - acf_group_setting_flag, /* flag for setting */ - acf_group_setting_ptr /* pointer for setting */ + acf_group_color, /* backdrop color */ + acf_group_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + acf_generic_group_offset, /* offset */ + + acf_group_name, /* name */ + acf_group_name_prop, /* name prop */ + NULL, /* icon */ + + acf_group_setting_valid, /* has setting */ + acf_group_setting_flag, /* flag for setting */ + acf_group_setting_ptr /* pointer for setting */ }; /* F-Curve ------------------------------------------- */ @@ -866,7 +866,7 @@ static void acf_fcurve_name(bAnimListElem *ale, char *name) /* check if some setting exists for this channel */ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int setting) { - FCurve *fcu= (FCurve *)ale->data; + FCurve *fcu = (FCurve *)ale->data; switch (setting) { /* unsupported */ @@ -878,10 +878,10 @@ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int if (fcu->bezt) return 1; else - return 0; // NOTE: in this special case, we need to draw ICON_ZOOMOUT + return 0; // NOTE: in this special case, we need to draw ICON_ZOOMOUT case ACHANNEL_SETTING_VISIBLE: /* Only available in Graph Editor */ - return (ac->spacetype==SPACE_IPO); + return (ac->spacetype == SPACE_IPO); /* always available */ default: @@ -893,7 +893,7 @@ static short acf_fcurve_setting_valid(bAnimContext *ac, bAnimListElem *ale, int static int acf_fcurve_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -917,7 +917,7 @@ static int acf_fcurve_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_fcurve_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type) { - FCurve *fcu= (FCurve *)ale->data; + FCurve *fcu = (FCurve *)ale->data; /* all flags are just in agrp->flag for now... */ return GET_ACF_FLAG_PTR(fcu->flag, type); @@ -926,20 +926,20 @@ static void *acf_fcurve_setting_ptr(bAnimListElem *ale, int UNUSED(setting), sho /* fcurve type define */ static bAnimChannelType ACF_FCURVE = { - "F-Curve", /* type name */ - - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indention_flexible, /* indent level */ // xxx rename this to f-curves only? - acf_generic_group_offset, /* offset */ + "F-Curve", /* type name */ - acf_fcurve_name, /* name */ - NULL, /* name prop */ - NULL, /* icon */ - - acf_fcurve_setting_valid, /* has setting */ - acf_fcurve_setting_flag, /* flag for setting */ - acf_fcurve_setting_ptr /* pointer for setting */ + acf_generic_channel_color, /* backdrop color */ + acf_generic_channel_backdrop, /* backdrop */ + acf_generic_indention_flexible, /* indent level */ // xxx rename this to f-curves only? + acf_generic_group_offset, /* offset */ + + acf_fcurve_name, /* name */ + NULL, /* name prop */ + NULL, /* icon */ + + acf_fcurve_setting_valid, /* has setting */ + acf_fcurve_setting_flag, /* flag for setting */ + acf_fcurve_setting_ptr /* pointer for setting */ }; /* Object Action Expander ------------------------------------------- */ @@ -968,14 +968,14 @@ static short acf_fillactd_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem static int acf_fillactd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ return ADT_UI_SELECTED; case ACHANNEL_SETTING_EXPAND: /* expanded */ - *neg= 1; + *neg = 1; return ACT_COLLAPSED; default: /* unsupported */ @@ -986,11 +986,11 @@ static int acf_fillactd_setting_flag(bAnimContext *UNUSED(ac), int setting, shor /* get pointer to the setting */ static void *acf_fillactd_setting_ptr(bAnimListElem *ale, int setting, short *type) { - bAction *act= (bAction *)ale->data; - AnimData *adt= ale->adt; + bAction *act = (bAction *)ale->data; + AnimData *adt = ale->adt; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1011,20 +1011,20 @@ static void *acf_fillactd_setting_ptr(bAnimListElem *ale, int setting, short *ty /* object action expander type define */ static bAnimChannelType ACF_FILLACTD = { - "Ob-Action Filler", /* type name */ + "Ob-Action Filler", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idfill_nameprop, /* name prop */ - acf_fillactd_icon, /* icon */ - - acf_fillactd_setting_valid, /* has setting */ - acf_fillactd_setting_flag, /* flag for setting */ - acf_fillactd_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idfill_nameprop, /* name prop */ + acf_fillactd_icon, /* icon */ + + acf_fillactd_setting_valid, /* has setting */ + acf_fillactd_setting_flag, /* flag for setting */ + acf_fillactd_setting_ptr /* pointer for setting */ }; /* Drivers Expander ------------------------------------------- */ @@ -1058,11 +1058,11 @@ static short acf_filldrivers_setting_valid(bAnimContext *UNUSED(ac), bAnimListEl static int acf_filldrivers_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ - *neg= 1; + *neg = 1; return ADT_DRIVERS_COLLAPSED; default: /* unsupported */ @@ -1073,10 +1073,10 @@ static int acf_filldrivers_setting_flag(bAnimContext *UNUSED(ac), int setting, s /* get pointer to the setting */ static void *acf_filldrivers_setting_ptr(bAnimListElem *ale, int setting, short *type) { - AnimData *adt= (AnimData *)ale->data; + AnimData *adt = (AnimData *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1090,20 +1090,20 @@ static void *acf_filldrivers_setting_ptr(bAnimListElem *ale, int setting, short /* drivers expander type define */ static bAnimChannelType ACF_FILLDRIVERS = { - "Drivers Filler", /* type name */ + "Drivers Filler", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_filldrivers_name, /* name */ - NULL, /* name prop */ - acf_filldrivers_icon, /* icon */ - - acf_filldrivers_setting_valid, /* has setting */ - acf_filldrivers_setting_flag, /* flag for setting */ - acf_filldrivers_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_filldrivers_name, /* name */ + NULL, /* name prop */ + acf_filldrivers_icon, /* icon */ + + acf_filldrivers_setting_valid, /* has setting */ + acf_filldrivers_setting_flag, /* flag for setting */ + acf_filldrivers_setting_ptr /* pointer for setting */ }; @@ -1119,7 +1119,7 @@ static int acf_dsmat_icon(bAnimListElem *UNUSED(ale)) static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1129,7 +1129,7 @@ static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1143,10 +1143,10 @@ static int acf_dsmat_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Material *ma= (Material *)ale->data; + Material *ma = (Material *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1166,22 +1166,22 @@ static void *acf_dsmat_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* material expander type define */ -static bAnimChannelType ACF_DSMAT= +static bAnimChannelType ACF_DSMAT = { - "Material Data Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + "Material Data Expander", /* type name */ - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsmat_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmat_setting_flag, /* flag for setting */ - acf_dsmat_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsmat_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsmat_setting_flag, /* flag for setting */ + acf_dsmat_setting_ptr /* pointer for setting */ }; /* Lamp Expander ------------------------------------------- */ @@ -1196,7 +1196,7 @@ static int acf_dslam_icon(bAnimListElem *UNUSED(ale)) static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1206,7 +1206,7 @@ static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1220,10 +1220,10 @@ static int acf_dslam_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dslam_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Lamp *la= (Lamp *)ale->data; + Lamp *la = (Lamp *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1243,22 +1243,22 @@ static void *acf_dslam_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* lamp expander type define */ -static bAnimChannelType ACF_DSLAM= +static bAnimChannelType ACF_DSLAM = { - "Lamp Expander", /* type name */ + "Lamp Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dslam_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dslam_setting_flag, /* flag for setting */ - acf_dslam_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dslam_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dslam_setting_flag, /* flag for setting */ + acf_dslam_setting_ptr /* pointer for setting */ }; /* Texture Expander ------------------------------------------- */ @@ -1280,7 +1280,7 @@ static short acf_dstex_offset(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(al static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1290,7 +1290,7 @@ static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1304,10 +1304,10 @@ static int acf_dstex_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dstex_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Tex *tex= (Tex *)ale->data; + Tex *tex = (Tex *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1327,22 +1327,22 @@ static void *acf_dstex_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* texture expander type define */ -static bAnimChannelType ACF_DSTEX= +static bAnimChannelType ACF_DSTEX = { - "Texture Data Expander", /* type name */ + "Texture Data Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_dstex_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idfill_nameprop, /* name prop */ - acf_dstex_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dstex_setting_flag, /* flag for setting */ - acf_dstex_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_dstex_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idfill_nameprop, /* name prop */ + acf_dstex_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dstex_setting_flag, /* flag for setting */ + acf_dstex_setting_ptr /* pointer for setting */ }; /* Camera Expander ------------------------------------------- */ @@ -1357,7 +1357,7 @@ static int acf_dscam_icon(bAnimListElem *UNUSED(ale)) static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1367,7 +1367,7 @@ static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1381,10 +1381,10 @@ static int acf_dscam_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dscam_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Camera *ca= (Camera *)ale->data; + Camera *ca = (Camera *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1404,22 +1404,22 @@ static void *acf_dscam_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* camera expander type define */ -static bAnimChannelType ACF_DSCAM= +static bAnimChannelType ACF_DSCAM = { - "Camera Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idfill_nameprop, /* name prop */ - acf_dscam_icon, /* icon */ + "Camera Expander", /* type name */ - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscam_setting_flag, /* flag for setting */ - acf_dscam_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idfill_nameprop, /* name prop */ + acf_dscam_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dscam_setting_flag, /* flag for setting */ + acf_dscam_setting_ptr /* pointer for setting */ }; /* Curve Expander ------------------------------------------- */ @@ -1427,8 +1427,8 @@ static bAnimChannelType ACF_DSCAM= // TODO: just get this from RNA? static int acf_dscur_icon(bAnimListElem *ale) { - Curve *cu= (Curve *)ale->data; - short obtype= BKE_curve_type_get(cu); + Curve *cu = (Curve *)ale->data; + short obtype = BKE_curve_type_get(cu); switch (obtype) { case OB_FONT: @@ -1444,7 +1444,7 @@ static int acf_dscur_icon(bAnimListElem *ale) static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1454,7 +1454,7 @@ static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1468,10 +1468,10 @@ static int acf_dscur_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dscur_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Curve *cu= (Curve *)ale->data; + Curve *cu = (Curve *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1491,22 +1491,22 @@ static void *acf_dscur_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* curve expander type define */ -static bAnimChannelType ACF_DSCUR= +static bAnimChannelType ACF_DSCUR = { - "Curve Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dscur_icon, /* icon */ + "Curve Expander", /* type name */ - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dscur_setting_flag, /* flag for setting */ - acf_dscur_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dscur_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dscur_setting_flag, /* flag for setting */ + acf_dscur_setting_ptr /* pointer for setting */ }; /* Shape Key Expander ------------------------------------------- */ @@ -1521,7 +1521,7 @@ static int acf_dsskey_icon(bAnimListElem *UNUSED(ale)) static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1531,7 +1531,7 @@ static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1545,10 +1545,10 @@ static int acf_dsskey_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_dsskey_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Key *key= (Key *)ale->data; + Key *key = (Key *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1568,22 +1568,22 @@ static void *acf_dsskey_setting_ptr(bAnimListElem *ale, int setting, short *type } /* shapekey expander type define */ -static bAnimChannelType ACF_DSSKEY= +static bAnimChannelType ACF_DSSKEY = { - "Shape Key Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ + "Shape Key Expander", /* type name */ - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsskey_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsskey_setting_flag, /* flag for setting */ - acf_dsskey_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsskey_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsskey_setting_flag, /* flag for setting */ + acf_dsskey_setting_ptr /* pointer for setting */ }; /* World Expander ------------------------------------------- */ @@ -1598,7 +1598,7 @@ static int acf_dswor_icon(bAnimListElem *UNUSED(ale)) static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1608,7 +1608,7 @@ static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1622,10 +1622,10 @@ static int acf_dswor_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dswor_setting_ptr(bAnimListElem *ale, int setting, short *type) { - World *wo= (World *)ale->data; + World *wo = (World *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1645,22 +1645,22 @@ static void *acf_dswor_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* world expander type define */ -static bAnimChannelType ACF_DSWOR= +static bAnimChannelType ACF_DSWOR = { - "World Expander", /* type name */ + "World Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idfill_nameprop, /* name prop */ - acf_dswor_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dswor_setting_flag, /* flag for setting */ - acf_dswor_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idfill_nameprop, /* name prop */ + acf_dswor_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dswor_setting_flag, /* flag for setting */ + acf_dswor_setting_ptr /* pointer for setting */ }; /* Particle Expander ------------------------------------------- */ @@ -1675,7 +1675,7 @@ static int acf_dspart_icon(bAnimListElem *UNUSED(ale)) static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1685,7 +1685,7 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1699,10 +1699,10 @@ static int acf_dspart_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_dspart_setting_ptr(bAnimListElem *ale, int setting, short *type) { - ParticleSettings *part= (ParticleSettings *)ale->data; + ParticleSettings *part = (ParticleSettings *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1722,22 +1722,22 @@ static void *acf_dspart_setting_ptr(bAnimListElem *ale, int setting, short *type } /* particle expander type define */ -static bAnimChannelType ACF_DSPART= +static bAnimChannelType ACF_DSPART = { - "Particle Data Expander", /* type name */ + "Particle Data Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dspart_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dspart_setting_flag, /* flag for setting */ - acf_dspart_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dspart_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dspart_setting_flag, /* flag for setting */ + acf_dspart_setting_ptr /* pointer for setting */ }; /* MetaBall Expander ------------------------------------------- */ @@ -1752,7 +1752,7 @@ static int acf_dsmball_icon(bAnimListElem *UNUSED(ale)) static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1762,7 +1762,7 @@ static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1776,10 +1776,10 @@ static int acf_dsmball_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_dsmball_setting_ptr(bAnimListElem *ale, int setting, short *type) { - MetaBall *mb= (MetaBall *)ale->data; + MetaBall *mb = (MetaBall *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1799,22 +1799,22 @@ static void *acf_dsmball_setting_ptr(bAnimListElem *ale, int setting, short *typ } /* metaball expander type define */ -static bAnimChannelType ACF_DSMBALL= +static bAnimChannelType ACF_DSMBALL = { - "Metaball Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsmball_icon, /* icon */ + "Metaball Expander", /* type name */ - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmball_setting_flag, /* flag for setting */ - acf_dsmball_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsmball_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsmball_setting_flag, /* flag for setting */ + acf_dsmball_setting_ptr /* pointer for setting */ }; /* Armature Expander ------------------------------------------- */ @@ -1829,7 +1829,7 @@ static int acf_dsarm_icon(bAnimListElem *UNUSED(ale)) static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1839,7 +1839,7 @@ static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1853,10 +1853,10 @@ static int acf_dsarm_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, int setting, short *type) { - bArmature *arm= (bArmature *)ale->data; + bArmature *arm = (bArmature *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1876,22 +1876,22 @@ static void *acf_dsarm_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* metaball expander type define */ -static bAnimChannelType ACF_DSARM= +static bAnimChannelType ACF_DSARM = { - "Armature Expander", /* type name */ + "Armature Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsarm_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsarm_setting_flag, /* flag for setting */ - acf_dsarm_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsarm_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsarm_setting_flag, /* flag for setting */ + acf_dsarm_setting_ptr /* pointer for setting */ }; /* NodeTree Expander ------------------------------------------- */ @@ -1906,7 +1906,7 @@ static int acf_dsntree_icon(bAnimListElem *UNUSED(ale)) static short acf_dsntree_offset(bAnimContext *ac, bAnimListElem *ale) { bNodeTree *ntree = (bNodeTree *)ale->data; - short offset= acf_generic_basic_offset(ac, ale); + short offset = acf_generic_basic_offset(ac, ale); offset += acf_nodetree_rootType_offset(ntree); @@ -1917,7 +1917,7 @@ static short acf_dsntree_offset(bAnimContext *ac, bAnimListElem *ale) static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1927,7 +1927,7 @@ static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -1941,10 +1941,10 @@ static int acf_dsntree_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *type) { - bNodeTree *ntree= (bNodeTree *)ale->data; + bNodeTree *ntree = (bNodeTree *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -1955,8 +1955,8 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *typ case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ if (ntree->adt) return GET_ACF_FLAG_PTR(ntree->adt->flag, type); - else - return NULL; + else + return NULL; default: /* unsupported */ return NULL; @@ -1964,22 +1964,22 @@ static void *acf_dsntree_setting_ptr(bAnimListElem *ale, int setting, short *typ } /* node tree expander type define */ -static bAnimChannelType ACF_DSNTREE= +static bAnimChannelType ACF_DSNTREE = { - "Node Tree Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_dsntree_offset, /* offset */ + "Node Tree Expander", /* type name */ - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsntree_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsntree_setting_flag, /* flag for setting */ - acf_dsntree_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_dsntree_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsntree_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsntree_setting_flag, /* flag for setting */ + acf_dsntree_setting_ptr /* pointer for setting */ }; /* LineStyle Expander ------------------------------------------- */ @@ -2071,7 +2071,7 @@ static int acf_dsmesh_icon(bAnimListElem *UNUSED(ale)) static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2081,7 +2081,7 @@ static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2095,10 +2095,10 @@ static int acf_dsmesh_setting_flag(bAnimContext *UNUSED(ac), int setting, short /* get pointer to the setting */ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Mesh *me= (Mesh *)ale->data; + Mesh *me = (Mesh *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2109,8 +2109,8 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ if (me->adt) return GET_ACF_FLAG_PTR(me->adt->flag, type); - else - return NULL; + else + return NULL; default: /* unsupported */ return NULL; @@ -2118,22 +2118,22 @@ static void *acf_dsmesh_setting_ptr(bAnimListElem *ale, int setting, short *type } /* node tree expander type define */ -static bAnimChannelType ACF_DSMESH= +static bAnimChannelType ACF_DSMESH = { - "Mesh Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ // XXX this only works for compositing - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsmesh_icon, /* icon */ + "Mesh Expander", /* type name */ - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsmesh_setting_flag, /* flag for setting */ - acf_dsmesh_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ // XXX this only works for compositing + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsmesh_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsmesh_setting_flag, /* flag for setting */ + acf_dsmesh_setting_ptr /* pointer for setting */ }; /* Lattice Expander ------------------------------------------- */ @@ -2148,7 +2148,7 @@ static int acf_dslat_icon(bAnimListElem *UNUSED(ale)) static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2158,7 +2158,7 @@ static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2172,10 +2172,10 @@ static int acf_dslat_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Lattice *lt= (Lattice *)ale->data; + Lattice *lt = (Lattice *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2186,8 +2186,8 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type) case ACHANNEL_SETTING_VISIBLE: /* visible (for Graph Editor only) */ if (lt->adt) return GET_ACF_FLAG_PTR(lt->adt->flag, type); - else - return NULL; + else + return NULL; default: /* unsupported */ return NULL; @@ -2195,22 +2195,22 @@ static void *acf_dslat_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* node tree expander type define */ -static bAnimChannelType ACF_DSLAT= +static bAnimChannelType ACF_DSLAT = { - "Lattice Expander", /* type name */ + "Lattice Expander", /* type name */ - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ // XXX this only works for compositing - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dslat_icon, /* icon */ - - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dslat_setting_flag, /* flag for setting */ - acf_dslat_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ // XXX this only works for compositing + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dslat_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dslat_setting_flag, /* flag for setting */ + acf_dslat_setting_ptr /* pointer for setting */ }; /* Speaker Expander ------------------------------------------- */ @@ -2225,7 +2225,7 @@ static int acf_dsspk_icon(bAnimListElem *UNUSED(ale)) static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2235,7 +2235,7 @@ static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short * return ADT_NLA_EVAL_OFF; case ACHANNEL_SETTING_VISIBLE: /* visible (only in Graph Editor) */ - *neg= 1; + *neg = 1; return ADT_CURVES_NOT_VISIBLE; case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2249,10 +2249,10 @@ static int acf_dsspk_setting_flag(bAnimContext *UNUSED(ac), int setting, short * /* get pointer to the setting */ static void *acf_dsspk_setting_ptr(bAnimListElem *ale, int setting, short *type) { - Speaker *spk= (Speaker *)ale->data; + Speaker *spk = (Speaker *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_EXPAND: /* expanded */ @@ -2272,22 +2272,22 @@ static void *acf_dsspk_setting_ptr(bAnimListElem *ale, int setting, short *type) } /* speaker expander type define */ -static bAnimChannelType ACF_DSSPK= +static bAnimChannelType ACF_DSSPK = { - "Speaker Expander", /* type name */ - - acf_generic_dataexpand_color, /* backdrop color */ - acf_generic_dataexpand_backdrop,/* backdrop */ - acf_generic_indention_1, /* indent level */ - acf_generic_basic_offset, /* offset */ - - acf_generic_idblock_name, /* name */ - acf_generic_idblock_nameprop, /* name prop */ - acf_dsspk_icon, /* icon */ + "Speaker Expander", /* type name */ - acf_generic_dataexpand_setting_valid, /* has setting */ - acf_dsspk_setting_flag, /* flag for setting */ - acf_dsspk_setting_ptr /* pointer for setting */ + acf_generic_dataexpand_color, /* backdrop color */ + acf_generic_dataexpand_backdrop, /* backdrop */ + acf_generic_indention_1, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idblock_nameprop, /* name prop */ + acf_dsspk_icon, /* icon */ + + acf_generic_dataexpand_setting_valid, /* has setting */ + acf_dsspk_setting_flag, /* flag for setting */ + acf_dsspk_setting_ptr /* pointer for setting */ }; /* ShapeKey Entry ------------------------------------------- */ @@ -2295,7 +2295,7 @@ static bAnimChannelType ACF_DSSPK= /* name for ShapeKey */ static void acf_shapekey_name(bAnimListElem *ale, char *name) { - KeyBlock *kb= (KeyBlock *)ale->data; + KeyBlock *kb = (KeyBlock *)ale->data; /* just copy the name... */ if (kb && name) { @@ -2310,7 +2310,7 @@ static void acf_shapekey_name(bAnimListElem *ale, char *name) /* name property for ShapeKey entries */ static short acf_shapekey_nameprop(bAnimListElem *ale, PointerRNA *ptr, PropertyRNA **prop) { - KeyBlock *kb= (KeyBlock *)ale->data; + KeyBlock *kb = (KeyBlock *)ale->data; /* if the KeyBlock had a name, use it, otherwise use the index */ if (kb && kb->name[0]) { @@ -2342,7 +2342,7 @@ static short acf_shapekey_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem static int acf_shapekey_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_MUTE: /* mute */ @@ -2362,10 +2362,10 @@ static int acf_shapekey_setting_flag(bAnimContext *UNUSED(ac), int setting, shor /* get pointer to the setting */ static void *acf_shapekey_setting_ptr(bAnimListElem *ale, int setting, short *type) { - KeyBlock *kb= (KeyBlock *)ale->data; + KeyBlock *kb = (KeyBlock *)ale->data; /* clear extra return data first */ - *type= 0; + *type = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2379,22 +2379,22 @@ static void *acf_shapekey_setting_ptr(bAnimListElem *ale, int setting, short *ty } /* shapekey expander type define */ -static bAnimChannelType ACF_SHAPEKEY= +static bAnimChannelType ACF_SHAPEKEY = { - "Shape Key", /* type name */ - - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - acf_generic_basic_offset, /* offset */ + "Shape Key", /* type name */ - acf_shapekey_name, /* name */ - acf_shapekey_nameprop, /* name prop */ - NULL, /* icon */ - - acf_shapekey_setting_valid, /* has setting */ - acf_shapekey_setting_flag, /* flag for setting */ - acf_shapekey_setting_ptr /* pointer for setting */ + acf_generic_channel_color, /* backdrop color */ + acf_generic_channel_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + acf_generic_basic_offset, /* offset */ + + acf_shapekey_name, /* name */ + acf_shapekey_nameprop, /* name prop */ + NULL, /* icon */ + + acf_shapekey_setting_valid, /* has setting */ + acf_shapekey_setting_flag, /* flag for setting */ + acf_shapekey_setting_ptr /* pointer for setting */ }; /* GPencil Datablock ------------------------------------------- */ @@ -2430,7 +2430,7 @@ static short acf_gpd_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUS static int acf_gpd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2447,7 +2447,7 @@ static int acf_gpd_setting_flag(bAnimContext *UNUSED(ac), int setting, short *ne /* get pointer to the setting */ static void *acf_gpd_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type) { - bGPdata *gpd= (bGPdata *)ale->data; + bGPdata *gpd = (bGPdata *)ale->data; /* all flags are just in gpd->flag for now... */ return GET_ACF_FLAG_PTR(gpd->flag, type); @@ -2456,20 +2456,20 @@ static void *acf_gpd_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short /* gpencil datablock type define */ static bAnimChannelType ACF_GPD = { - "GPencil Datablock", /* type name */ - - acf_gpd_color, /* backdrop color */ - acf_group_backdrop, /* backdrop */ - acf_generic_indention_0, /* indent level */ - acf_generic_group_offset, /* offset */ + "GPencil Datablock", /* type name */ - acf_generic_idblock_name, /* name */ - acf_generic_idfill_nameprop, /* name prop */ - acf_gpd_icon, /* icon */ - - acf_gpd_setting_valid, /* has setting */ - acf_gpd_setting_flag, /* flag for setting */ - acf_gpd_setting_ptr /* pointer for setting */ + acf_gpd_color, /* backdrop color */ + acf_group_backdrop, /* backdrop */ + acf_generic_indention_0, /* indent level */ + acf_generic_group_offset, /* offset */ + + acf_generic_idblock_name, /* name */ + acf_generic_idfill_nameprop, /* name prop */ + acf_gpd_icon, /* icon */ + + acf_gpd_setting_valid, /* has setting */ + acf_gpd_setting_flag, /* flag for setting */ + acf_gpd_setting_ptr /* pointer for setting */ }; /* GPencil Layer ------------------------------------------- */ @@ -2515,7 +2515,7 @@ static short acf_gpl_setting_valid(bAnimContext *UNUSED(ac), bAnimListElem *UNUS static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), int setting, short *neg) { /* clear extra return data first */ - *neg= 0; + *neg = 0; switch (setting) { case ACHANNEL_SETTING_SELECT: /* selected */ @@ -2536,7 +2536,7 @@ static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), int setting, short *ne /* get pointer to the setting */ static void *acf_gpl_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short *type) { - bGPDlayer *gpl= (bGPDlayer *)ale->data; + bGPDlayer *gpl = (bGPDlayer *)ale->data; /* all flags are just in agrp->flag for now... */ return GET_ACF_FLAG_PTR(gpl->flag, type); @@ -2545,20 +2545,20 @@ static void *acf_gpl_setting_ptr(bAnimListElem *ale, int UNUSED(setting), short /* grease pencil layer type define */ static bAnimChannelType ACF_GPL = { - "GPencil Layer", /* type name */ - - acf_generic_channel_color, /* backdrop color */ - acf_generic_channel_backdrop, /* backdrop */ - acf_generic_indention_flexible, /* indent level */ - acf_generic_group_offset, /* offset */ + "GPencil Layer", /* type name */ - acf_gpl_name, /* name */ - acf_gpl_name_prop, /* name prop */ - NULL, /* icon */ - - acf_gpl_setting_valid, /* has setting */ - acf_gpl_setting_flag, /* flag for setting */ - acf_gpl_setting_ptr /* pointer for setting */ + acf_generic_channel_color, /* backdrop color */ + acf_generic_channel_backdrop, /* backdrop */ + acf_generic_indention_flexible, /* indent level */ + acf_generic_group_offset, /* offset */ + + acf_gpl_name, /* name */ + acf_gpl_name_prop, /* name prop */ + NULL, /* icon */ + + acf_gpl_setting_valid, /* has setting */ + acf_gpl_setting_flag, /* flag for setting */ + acf_gpl_setting_ptr /* pointer for setting */ }; /* *********************************************** */ @@ -2566,61 +2566,61 @@ static bAnimChannelType ACF_GPL = /* These globals only ever get directly accessed in this file */ static bAnimChannelType *animchannelTypeInfo[ANIMTYPE_NUM_TYPES]; -static short ACF_INIT= 1; /* when non-zero, the list needs to be updated */ +static short ACF_INIT = 1; /* when non-zero, the list needs to be updated */ /* Initialize type info definitions */ -static void ANIM_init_channel_typeinfo_data (void) +static void ANIM_init_channel_typeinfo_data(void) { - int type= 0; + int type = 0; /* start initializing if necessary... */ if (ACF_INIT) { - ACF_INIT= 0; - - animchannelTypeInfo[type++]= NULL; /* None */ - animchannelTypeInfo[type++]= NULL; /* AnimData */ - animchannelTypeInfo[type++]= NULL; /* Special */ - - animchannelTypeInfo[type++]= &ACF_SUMMARY; /* Motion Summary */ - - animchannelTypeInfo[type++]= &ACF_SCENE; /* Scene */ - animchannelTypeInfo[type++]= &ACF_OBJECT; /* Object */ - animchannelTypeInfo[type++]= &ACF_GROUP; /* Group */ - animchannelTypeInfo[type++]= &ACF_FCURVE; /* F-Curve */ - - animchannelTypeInfo[type++]= &ACF_FILLACTD; /* Object Action Expander */ - animchannelTypeInfo[type++]= &ACF_FILLDRIVERS; /* Drivers Expander */ - - animchannelTypeInfo[type++]= &ACF_DSMAT; /* Material Channel */ - animchannelTypeInfo[type++]= &ACF_DSLAM; /* Lamp Channel */ - animchannelTypeInfo[type++]= &ACF_DSCAM; /* Camera Channel */ - animchannelTypeInfo[type++]= &ACF_DSCUR; /* Curve Channel */ - animchannelTypeInfo[type++]= &ACF_DSSKEY; /* ShapeKey Channel */ - animchannelTypeInfo[type++]= &ACF_DSWOR; /* World Channel */ - animchannelTypeInfo[type++]= &ACF_DSNTREE; /* NodeTree Channel */ - animchannelTypeInfo[type++]= &ACF_DSPART; /* Particle Channel */ - animchannelTypeInfo[type++]= &ACF_DSMBALL; /* MetaBall Channel */ - animchannelTypeInfo[type++]= &ACF_DSARM; /* Armature Channel */ - animchannelTypeInfo[type++]= &ACF_DSMESH; /* Mesh Channel */ - animchannelTypeInfo[type++]= &ACF_DSTEX; /* Texture Channel */ - animchannelTypeInfo[type++]= &ACF_DSLAT; /* Lattice Channel */ - animchannelTypeInfo[type++]= &ACF_DSLINESTYLE; /* LineStyle Channel */ - animchannelTypeInfo[type++]= &ACF_DSSPK; /* Speaker Channel */ - - animchannelTypeInfo[type++]= &ACF_SHAPEKEY; /* ShapeKey */ - - animchannelTypeInfo[type++]= &ACF_GPD; /* Grease Pencil Datablock */ - animchannelTypeInfo[type++]= &ACF_GPL; /* Grease Pencil Layer */ - - // TODO: these types still need to be implemented!!! - // probably need a few extra flags for these special cases... - animchannelTypeInfo[type++]= NULL; /* NLA Track */ - animchannelTypeInfo[type++]= NULL; /* NLA Action */ + ACF_INIT = 0; + + animchannelTypeInfo[type++] = NULL; /* None */ + animchannelTypeInfo[type++] = NULL; /* AnimData */ + animchannelTypeInfo[type++] = NULL; /* Special */ + + animchannelTypeInfo[type++] = &ACF_SUMMARY; /* Motion Summary */ + + animchannelTypeInfo[type++] = &ACF_SCENE; /* Scene */ + animchannelTypeInfo[type++] = &ACF_OBJECT; /* Object */ + animchannelTypeInfo[type++] = &ACF_GROUP; /* Group */ + animchannelTypeInfo[type++] = &ACF_FCURVE; /* F-Curve */ + + animchannelTypeInfo[type++] = &ACF_FILLACTD; /* Object Action Expander */ + animchannelTypeInfo[type++] = &ACF_FILLDRIVERS; /* Drivers Expander */ + + animchannelTypeInfo[type++] = &ACF_DSMAT; /* Material Channel */ + animchannelTypeInfo[type++] = &ACF_DSLAM; /* Lamp Channel */ + animchannelTypeInfo[type++] = &ACF_DSCAM; /* Camera Channel */ + animchannelTypeInfo[type++] = &ACF_DSCUR; /* Curve Channel */ + animchannelTypeInfo[type++] = &ACF_DSSKEY; /* ShapeKey Channel */ + animchannelTypeInfo[type++] = &ACF_DSWOR; /* World Channel */ + animchannelTypeInfo[type++] = &ACF_DSNTREE; /* NodeTree Channel */ + animchannelTypeInfo[type++] = &ACF_DSPART; /* Particle Channel */ + animchannelTypeInfo[type++] = &ACF_DSMBALL; /* MetaBall Channel */ + animchannelTypeInfo[type++] = &ACF_DSARM; /* Armature Channel */ + animchannelTypeInfo[type++] = &ACF_DSMESH; /* Mesh Channel */ + animchannelTypeInfo[type++] = &ACF_DSTEX; /* Texture Channel */ + animchannelTypeInfo[type++] = &ACF_DSLAT; /* Lattice Channel */ + animchannelTypeInfo[type++] = &ACF_DSSPK; /* Speaker Channel */ + animchannelTypeInfo[type++] = &ACF_DSLINESTYLE; /* LineStyle Channel */ + + animchannelTypeInfo[type++] = &ACF_SHAPEKEY; /* ShapeKey */ + + animchannelTypeInfo[type++] = &ACF_GPD; /* Grease Pencil Datablock */ + animchannelTypeInfo[type++] = &ACF_GPL; /* Grease Pencil Layer */ + + // TODO: these types still need to be implemented!!! + // probably need a few extra flags for these special cases... + animchannelTypeInfo[type++] = NULL; /* NLA Track */ + animchannelTypeInfo[type++] = NULL; /* NLA Action */ } } /* Get type info from given channel type */ -bAnimChannelType *ANIM_channel_get_typeinfo (bAnimListElem *ale) +bAnimChannelType *ANIM_channel_get_typeinfo(bAnimListElem *ale) { /* santiy checks */ if (ale == NULL) @@ -2641,7 +2641,7 @@ bAnimChannelType *ANIM_channel_get_typeinfo (bAnimListElem *ale) /* Print debug info string for the given channel */ void ANIM_channel_debug_print_info(bAnimListElem *ale, short indent_level) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); /* print indents */ for (; indent_level > 0; indent_level--) @@ -2673,7 +2673,7 @@ void ANIM_channel_debug_print_info(bAnimListElem *ale, short indent_level) */ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); /* 1) check that the setting exists for the current context */ if ((acf) && (!acf->has_setting || acf->has_setting(ac, ale, setting))) { @@ -2682,44 +2682,44 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting int flag; void *ptr; - flag= acf->setting_flag(ac, setting, &negflag); - ptr= acf->setting_ptr(ale, setting, &ptrsize); + flag = acf->setting_flag(ac, setting, &negflag); + ptr = acf->setting_ptr(ale, setting, &ptrsize); /* check if flag is enabled */ if (ptr && flag) { switch (ptrsize) { - case sizeof(int): /* integer pointer for setting */ + case sizeof(int): /* integer pointer for setting */ { - int *val= (int *)ptr; + int *val = (int *)ptr; if (negflag) return ((*val) & flag) == 0; else return ((*val) & flag) != 0; } - break; + break; - case sizeof(short): /* short pointer for setting */ + case sizeof(short): /* short pointer for setting */ { - short *val= (short *)ptr; + short *val = (short *)ptr; if (negflag) return ((*val) & flag) == 0; else return ((*val) & flag) != 0; } - break; + break; - case sizeof(char): /* char pointer for setting */ + case sizeof(char): /* char pointer for setting */ { - char *val= (char *)ptr; + char *val = (char *)ptr; if (negflag) return ((*val) & flag) == 0; else return ((*val) & flag) != 0; } - break; + break; } } } @@ -2731,17 +2731,17 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting /* quick macro for use in ANIM_channel_setting_set - set flag for setting according the mode given */ #define ACF_SETTING_SET(sval, sflag, smode) \ - {\ - if (negflag) {\ - if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \ + { \ + if (negflag) { \ + if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (sval) &= ~(sflag); \ - else (sval) |= (sflag); \ + else (sval) |= (sflag); \ } \ - else {\ - if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \ + else { \ + if (smode == ACHANNEL_SETFLAG_INVERT) (sval) ^= (sflag); \ else if (smode == ACHANNEL_SETFLAG_ADD) (sval) |= (sflag); \ - else (sval) &= ~(sflag); \ - }\ + else (sval) &= ~(sflag); \ + } \ } /* Change value of some setting for a channel @@ -2750,7 +2750,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting */ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting, short mode) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); /* 1) check that the setting exists for the current context */ if ((acf) && (!acf->has_setting || acf->has_setting(ac, ale, setting))) { @@ -2759,32 +2759,32 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting, int flag; void *ptr; - flag= acf->setting_flag(ac, setting, &negflag); - ptr= acf->setting_ptr(ale, setting, &ptrsize); + flag = acf->setting_flag(ac, setting, &negflag); + ptr = acf->setting_ptr(ale, setting, &ptrsize); /* check if flag is enabled */ if (ptr && flag) { switch (ptrsize) { - case sizeof(int): /* integer pointer for setting */ + case sizeof(int): /* integer pointer for setting */ { - int *val= (int *)ptr; + int *val = (int *)ptr; ACF_SETTING_SET(*val, flag, mode); } - break; + break; - case sizeof(short): /* short pointer for setting */ + case sizeof(short): /* short pointer for setting */ { - short *val= (short *)ptr; + short *val = (short *)ptr; ACF_SETTING_SET(*val, flag, mode); } - break; + break; - case sizeof(char): /* char pointer for setting */ + case sizeof(char): /* char pointer for setting */ { - char *val= (char *)ptr; + char *val = (char *)ptr; ACF_SETTING_SET(*val, flag, mode); } - break; + break; } } } @@ -2793,9 +2793,9 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting, /* --------------------------- */ // XXX hardcoded size of icons -#define ICON_WIDTH 17 +#define ICON_WIDTH 17 // XXX hardcoded width of sliders -#define SLIDER_WIDTH 80 +#define SLIDER_WIDTH 80 // XXX hardcoded width of rename textboxes #define RENAME_TEXT_WIDTH 100 @@ -2803,8 +2803,8 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting, // TODO: make this use UI controls for the buttons void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float ymaxc) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; short selected, offset; float y, ymid, ytext; @@ -2814,23 +2814,23 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float /* get initial offset */ if (acf->get_offset) - offset= acf->get_offset(ac, ale); + offset = acf->get_offset(ac, ale); else - offset= 0; + offset = 0; /* calculate appropriate y-coordinates for icon buttons * 7 is hardcoded factor for half-height of icons */ - y= (ymaxc - yminc)/2 + yminc; - ymid= y - 7; + y = (ymaxc - yminc) / 2 + yminc; + ymid = y - 7; /* y-coordinates for text is only 4 down from middle */ - ytext= y - 4; + ytext = y - 4; /* check if channel is selected */ if (acf->has_setting(ac, ale, ACHANNEL_SETTING_SELECT)) - selected= ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT); + selected = ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT); else - selected= 0; + selected = 0; /* set blending again, as may not be set in previous step */ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -2863,7 +2863,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float if ((ac->spacetype == SPACE_IPO) && acf->has_setting(ac, ale, ACHANNEL_SETTING_VISIBLE)) { /* for F-Curves, draw color-preview of curve behind checkbox */ if (ale->type == ANIMTYPE_FCURVE) { - FCurve *fcu= (FCurve *)ale->data; + FCurve *fcu = (FCurve *)ale->data; /* F-Curve channels need to have a special 'color code' box drawn, which is colored with whatever * color the curve has stored @@ -2871,10 +2871,10 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float glColor3fv(fcu->color); /* just a solid color rect - * hardcoded 17 pixels width is slightly wider than icon width, so that + * hardcoded 17 pixels width is slightly wider than icon width, so that * there's a slight border around it */ - glRectf(offset, yminc, offset+17, ymaxc); + glRectf(offset, yminc, offset + 17, ymaxc); } /* icon is drawn as widget now... */ @@ -2909,8 +2909,8 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float // FIXME: replace hardcoded color here, and check on extents! glColor3f(1.0f, 0.0f, 0.0f); glLineWidth(2.0); - fdrawline((float)(offset), yminc, - (float)(v2d->cur.xmax), yminc); + fdrawline((float)(offset), yminc, + (float)(v2d->cur.xmax), yminc); glLineWidth(1.0); } } @@ -2934,21 +2934,21 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float switch (ac->spacetype) { case SPACE_ACTION: { - SpaceAction *saction= (SpaceAction *)ac->sl; - draw_sliders= (saction->flag & SACTION_SLIDERS); + SpaceAction *saction = (SpaceAction *)ac->sl; + draw_sliders = (saction->flag & SACTION_SLIDERS); } - break; + break; case SPACE_IPO: { - SpaceIpo *sipo= (SpaceIpo *)ac->sl; - draw_sliders= (sipo->flag & SIPO_SLIDERS); + SpaceIpo *sipo = (SpaceIpo *)ac->sl; + draw_sliders = (sipo->flag & SIPO_SLIDERS); } - break; + break; } } /* check if there's enough space for the toggles if the sliders are drawn too */ - if ( !(draw_sliders) || ((v2d->mask.xmax-v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH/2) ) { + if (!(draw_sliders) || ((v2d->mask.xmax - v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH / 2) ) { /* protect... */ if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) offset += ICON_WIDTH; @@ -2972,7 +2972,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float * - starts from the point where the first toggle/slider starts, * - ends past the space that might be reserved for a scroller */ - glRectf(v2d->cur.xmax-(float)offset, yminc, v2d->cur.xmax+EXTRA_SCROLL_PAD, ymaxc); + glRectf(v2d->cur.xmax - (float)offset, yminc, v2d->cur.xmax + EXTRA_SCROLL_PAD, ymaxc); } } @@ -2981,13 +2981,13 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float /* callback for (normal) widget settings - send notifiers */ static void achannel_setting_widget_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2)) { - WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); + WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); } /* callback for widget settings that need flushing */ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void *setting_wrap) { - bAnimListElem *ale_setting= (bAnimListElem *)ale_npoin; + bAnimListElem *ale_setting = (bAnimListElem *)ale_npoin; bAnimContext ac; ListBase anim_data = {NULL, NULL}; int filter; @@ -2995,7 +2995,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void short on = 0; /* send notifiers before doing anything else... */ - WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); + WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); /* verify animation context */ if (ANIM_animdata_get_context(C, &ac) == 0) @@ -3004,7 +3004,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void /* verify that we have a channel to operate on, and that it has all we need */ if (ale_setting) { /* check if the setting is on... */ - on= ANIM_channel_setting_get(&ac, ale_setting, setting); + on = ANIM_channel_setting_get(&ac, ale_setting, setting); /* on == -1 means setting not found... */ if (on == -1) @@ -3014,7 +3014,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void return; /* get all channels that can possibly be chosen - but ignore hierarchy */ - filter= ANIMFILTER_DATA_VISIBLE|ANIMFILTER_LIST_CHANNELS; + filter = ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_CHANNELS; ANIM_animdata_filter(&ac, &anim_data, filter, ac.data, ac.datatype); /* call API method to flush the setting */ @@ -3034,25 +3034,25 @@ static void achannel_setting_rename_done_cb(bContext *C, void *ads_poin, void *U /* send notifiers */ // XXX: right notifier? - WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_RENAME, NULL); + WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_RENAME, NULL); } /* callback for widget sliders - insert keyframes */ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poin) { - ID *id= (ID *)id_poin; - FCurve *fcu= (FCurve *)fcu_poin; + ID *id = (ID *)id_poin; + FCurve *fcu = (FCurve *)fcu_poin; ReportList *reports = CTX_wm_reports(C); - Scene *scene= CTX_data_scene(C); + Scene *scene = CTX_data_scene(C); PointerRNA id_ptr, ptr; PropertyRNA *prop; - short flag=0, done=0; + short flag = 0, done = 0; float cfra; /* get current frame */ // NOTE: this will do for now... - cfra= (float)CFRA; + cfra = (float)CFRA; /* get flags for keyframing */ flag = ANIM_get_keyframing_flags(scene, 1); @@ -3067,30 +3067,30 @@ static void achannel_setting_slider_cb(bContext *C, void *id_poin, void *fcu_poi flag |= INSERTKEY_REPLACE; /* insert a keyframe for this F-Curve */ - done= insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag); + done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag); if (done) - WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); + WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); } } /* callback for shapekey widget sliders - insert keyframes */ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, void *kb_poin) { - Key *key= (Key *)key_poin; - KeyBlock *kb= (KeyBlock *)kb_poin; - char *rna_path= key_get_curValue_rnaPath(key, kb); + Key *key = (Key *)key_poin; + KeyBlock *kb = (KeyBlock *)kb_poin; + char *rna_path = key_get_curValue_rnaPath(key, kb); ReportList *reports = CTX_wm_reports(C); - Scene *scene= CTX_data_scene(C); + Scene *scene = CTX_data_scene(C); PointerRNA id_ptr, ptr; PropertyRNA *prop; - short flag=0, done=0; + short flag = 0, done = 0; float cfra; /* get current frame */ // NOTE: this will do for now... - cfra= (float)CFRA; + cfra = (float)CFRA; /* get flags for keyframing */ flag = ANIM_get_keyframing_flags(scene, 1); @@ -3102,18 +3102,18 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi if (RNA_path_resolve(&id_ptr, rna_path, &ptr, &prop)) { /* find or create new F-Curve */ // XXX is the group name for this ok? - bAction *act= verify_adt_action((ID *)key, 1); - FCurve *fcu= verify_fcurve(act, NULL, rna_path, 0, 1); + bAction *act = verify_adt_action((ID *)key, 1); + FCurve *fcu = verify_fcurve(act, NULL, rna_path, 0, 1); /* set the special 'replace' flag if on a keyframe */ if (fcurve_frame_has_keyframe(fcu, cfra, 0)) flag |= INSERTKEY_REPLACE; /* insert a keyframe for this F-Curve */ - done= insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag); + done = insert_keyframe_direct(reports, ptr, prop, fcu, cfra, flag); if (done) - WM_event_add_notifier(C, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); + WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); } /* free the path */ @@ -3132,32 +3132,32 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann uiBut *but = NULL; /* get the flag and the pointer to that flag */ - flag= acf->setting_flag(ac, setting, &negflag); - ptr= acf->setting_ptr(ale, setting, &ptrsize); + flag = acf->setting_flag(ac, setting, &negflag); + ptr = acf->setting_ptr(ale, setting, &ptrsize); /* enabled= ANIM_channel_setting_get(ac, ale, setting); */ /* UNUSED */ /* get the base icon for the setting */ switch (setting) { - case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */ + case ACHANNEL_SETTING_VISIBLE: /* visibility eyes */ //icon= ((enabled)? ICON_VISIBLE_IPO_ON : ICON_VISIBLE_IPO_OFF); - icon= ICON_VISIBLE_IPO_OFF; + icon = ICON_VISIBLE_IPO_OFF; if (ale->type == ANIMTYPE_FCURVE) - tooltip= "Channel is visible in Graph Editor for editing"; + tooltip = "Channel is visible in Graph Editor for editing"; else - tooltip= "Channel(s) are visible in Graph Editor for editing"; + tooltip = "Channel(s) are visible in Graph Editor for editing"; break; case ACHANNEL_SETTING_EXPAND: /* expanded triangle */ //icon= ((enabled)? ICON_TRIA_DOWN : ICON_TRIA_RIGHT); - icon= ICON_TRIA_RIGHT; - tooltip= "Make channels grouped under this channel visible"; + icon = ICON_TRIA_RIGHT; + tooltip = "Make channels grouped under this channel visible"; break; case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */ //icon= ((enabled)? ICON_LAYER_ACTIVE : ICON_LAYER_USED); - icon= ICON_LAYER_USED; - tooltip= "NLA Track is the only one evaluated for the AnimData block it belongs to"; + icon = ICON_LAYER_USED; + tooltip = "NLA Track is the only one evaluated for the AnimData block it belongs to"; break; /* --- */ @@ -3165,48 +3165,48 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann case ACHANNEL_SETTING_PROTECT: /* protected lock */ // TODO: what about when there's no protect needed? //icon= ((enabled)? ICON_LOCKED : ICON_UNLOCKED); - icon= ICON_UNLOCKED; - tooltip= "Editability of keyframes for this channel"; + icon = ICON_UNLOCKED; + tooltip = "Editability of keyframes for this channel"; break; case ACHANNEL_SETTING_MUTE: /* muted speaker */ //icon= ((enabled)? ICON_MUTE_IPO_ON : ICON_MUTE_IPO_OFF); - icon= ICON_MUTE_IPO_OFF; + icon = ICON_MUTE_IPO_OFF; if (ale->type == ALE_FCURVE) - tooltip= "Does F-Curve contribute to result"; + tooltip = "Does F-Curve contribute to result"; else - tooltip= "Do channels contribute to result"; + tooltip = "Do channels contribute to result"; break; default: - tooltip= NULL; - icon= 0; + tooltip = NULL; + icon = 0; break; } /* type of button */ if (negflag) - butType= ICONTOGN; + butType = ICONTOGN; else - butType= ICONTOG; + butType = ICONTOG; /* draw button for setting */ if (ptr && flag) { switch (ptrsize) { - case sizeof(int): /* integer pointer for setting */ + case sizeof(int): /* integer pointer for setting */ but = uiDefIconButBitI(block, butType, flag, 0, icon, - xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); + xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); break; - case sizeof(short): /* short pointer for setting */ + case sizeof(short): /* short pointer for setting */ but = uiDefIconButBitS(block, butType, flag, 0, icon, - xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); + xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); break; - case sizeof(char): /* char pointer for setting */ + case sizeof(char): /* char pointer for setting */ but = uiDefIconButBitC(block, butType, flag, 0, icon, - xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); + xpos, ypos, ICON_WIDTH, ICON_WIDTH, ptr, 0, 0, 0, 0, tooltip); break; } @@ -3232,9 +3232,9 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, bAnimChann /* Draw UI widgets the given channel */ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale, uiBlock *block, float yminc, float ymaxc, size_t channel_index) { - bAnimChannelType *acf= ANIM_channel_get_typeinfo(ale); - View2D *v2d= &ac->ar->v2d; - float y, ymid/*, ytext*/; + bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale); + View2D *v2d = &ac->ar->v2d; + float y, ymid /*, ytext*/; short offset; /* sanity checks - don't draw anything */ @@ -3243,15 +3243,15 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale /* get initial offset */ if (acf->get_offset) - offset= acf->get_offset(ac, ale); + offset = acf->get_offset(ac, ale); else - offset= 0; + offset = 0; /* calculate appropriate y-coordinates for icon buttons * 7 is hardcoded factor for half-height of icons */ - y= (ymaxc - yminc)/2 + yminc; - ymid= y - 7; + y = (ymaxc - yminc) / 2 + yminc; + ymid = y - 7; /* y-coordinates for text is only 4 down from middle */ /* ytext= y - 4; */ @@ -3292,7 +3292,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale float channel_height = ymaxc - yminc; /* if rename index matches, add widget for this */ - if (ac->ads->renameIndex == channel_index+1) { + if (ac->ads->renameIndex == channel_index + 1) { PointerRNA ptr; PropertyRNA *prop; @@ -3302,7 +3302,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale uiBlockSetEmboss(block, UI_EMBOSS); - but = uiDefButR(block, TEX, 1, "", offset+3, yminc, RENAME_TEXT_WIDTH, channel_height, + but = uiDefButR(block, TEX, 1, "", offset + 3, yminc, RENAME_TEXT_WIDTH, channel_height, &ptr, RNA_property_identifier(prop), -1, 0, 0, -1, -1, NULL); uiButSetFunc(but, achannel_setting_rename_done_cb, ac->ads, NULL); uiButActiveOnly(C, block, but); @@ -3326,30 +3326,30 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale switch (ac->spacetype) { case SPACE_ACTION: { - SpaceAction *saction= (SpaceAction *)ac->sl; - draw_sliders= (saction->flag & SACTION_SLIDERS); + SpaceAction *saction = (SpaceAction *)ac->sl; + draw_sliders = (saction->flag & SACTION_SLIDERS); } - break; + break; case SPACE_IPO: { - SpaceIpo *sipo= (SpaceIpo *)ac->sl; - draw_sliders= (sipo->flag & SIPO_SLIDERS); + SpaceIpo *sipo = (SpaceIpo *)ac->sl; + draw_sliders = (sipo->flag & SIPO_SLIDERS); } - break; + break; } } /* check if there's enough space for the toggles if the sliders are drawn too */ - if ( !(draw_sliders) || ((v2d->mask.xmax-v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH/2) ) { + if (!(draw_sliders) || ((v2d->mask.xmax - v2d->mask.xmin) > ACHANNEL_BUTTON_WIDTH / 2) ) { /* protect... */ if (acf->has_setting(ac, ale, ACHANNEL_SETTING_PROTECT)) { offset += ICON_WIDTH; - draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_PROTECT); + draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax - offset, ymid, ACHANNEL_SETTING_PROTECT); } /* mute... */ if (acf->has_setting(ac, ale, ACHANNEL_SETTING_MUTE)) { offset += ICON_WIDTH; - draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax-offset, ymid, ACHANNEL_SETTING_MUTE); + draw_setting_widget(ac, ale, acf, block, (int)v2d->cur.xmax - offset, ymid, ACHANNEL_SETTING_MUTE); } } @@ -3378,17 +3378,17 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale /* get destination info */ if (ale->type == ANIMTYPE_FCURVE) { - FCurve *fcu= (FCurve *)ale->data; + FCurve *fcu = (FCurve *)ale->data; - rna_path= fcu->rna_path; - array_index= fcu->array_index; + rna_path = fcu->rna_path; + array_index = fcu->array_index; } else if (ale->type == ANIMTYPE_SHAPEKEY) { - KeyBlock *kb= (KeyBlock *)ale->data; - Key *key= (Key *)ale->id; + KeyBlock *kb = (KeyBlock *)ale->data; + Key *key = (Key *)ale->id; - rna_path= key_get_curValue_rnaPath(key, kb); - free_path= 1; + rna_path = key_get_curValue_rnaPath(key, kb); + free_path = 1; } /* only if RNA-Path found */ @@ -3401,7 +3401,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale uiBut *but; /* create the slider button, and assign relevant callback to ensure keyframes are inserted... */ - but = uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NONE, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc); + but = uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NONE, (int)v2d->cur.xmax - offset, ymid, SLIDER_WIDTH, (int)ymaxc - yminc); /* assign keyframing function according to slider type */ if (ale->type == ANIMTYPE_SHAPEKEY) |