diff options
author | Thomas Dinges <blender@dingto.org> | 2013-05-09 14:03:38 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-05-09 14:03:38 +0400 |
commit | c1f408c0589ab497041672e4137652de06df6d50 (patch) | |
tree | 90f15e9086c97d1a9a98699cc07caa79b78dcee1 /source/blender/editors/animation/anim_channels_defines.c | |
parent | 3fb67ac16db112b5404e0ed6ffa43deb09596381 (diff) |
Partial revert of own commits r56604 and r56603:
* Reverted the changes to code comments, as suggested by Campbell. It makes it more hard to follow.
* Only keep changes to actual UI messages.
Diffstat (limited to 'source/blender/editors/animation/anim_channels_defines.c')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 368fc711885..a441dce5656 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -464,13 +464,13 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ bAnimContext *ac = (bAnimContext *)ale->data; /* if data is valid, return pointer to active dopesheet's relevant flag - * - this is restricted to Dope Sheet/Action Editor only + * - 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; - /* return pointer to Dope Sheet's flag */ + /* return pointer to DopeSheet's flag */ return GET_ACF_FLAG_PTR(ads->flag, type); } else { @@ -480,7 +480,7 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ } } -/* all animation summary (Dope Sheet only) type define */ +/* all animation summary (DopeSheet only) type define */ static bAnimChannelType ACF_SUMMARY = { "Summary", /* type name */ @@ -843,7 +843,7 @@ static int acf_group_setting_flag(bAnimContext *ac, int setting, short *neg) */ return (ac->spacetype == SPACE_IPO) ? AGRP_EXPANDED_G : /* Graph Editor case */ - AGRP_EXPANDED; /* Dope Sheet and elsewhere */ + AGRP_EXPANDED; /* DopeSheet and elsewhere */ } case ACHANNEL_SETTING_MUTE: /* muted */ @@ -2346,9 +2346,9 @@ static bAnimChannelType ACF_DSSPK = acf_dsspk_setting_ptr /* pointer for setting */ }; -/* Shape Key Entry ------------------------------------------- */ +/* ShapeKey Entry ------------------------------------------- */ -/* name for Shape Key */ +/* name for ShapeKey */ static void acf_shapekey_name(bAnimListElem *ale, char *name) { KeyBlock *kb = (KeyBlock *)ale->data; @@ -2363,7 +2363,7 @@ static void acf_shapekey_name(bAnimListElem *ale, char *name) } } -/* name property for Shape Key entries */ +/* name property for ShapeKey entries */ static short acf_shapekey_nameprop(bAnimListElem *ale, PointerRNA *ptr, PropertyRNA **prop) { KeyBlock *kb = (KeyBlock *)ale->data; @@ -2817,7 +2817,7 @@ static void ANIM_init_channel_typeinfo_data(void) animchannelTypeInfo[type++] = &ACF_DSLAM; /* Lamp Channel */ animchannelTypeInfo[type++] = &ACF_DSCAM; /* Camera Channel */ animchannelTypeInfo[type++] = &ACF_DSCUR; /* Curve Channel */ - animchannelTypeInfo[type++] = &ACF_DSSKEY; /* Shape Key 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 */ @@ -2829,7 +2829,7 @@ static void ANIM_init_channel_typeinfo_data(void) animchannelTypeInfo[type++] = &ACF_DSSPK; /* Speaker Channel */ animchannelTypeInfo[type++] = &ACF_DSLINESTYLE; /* LineStyle Channel */ - animchannelTypeInfo[type++] = &ACF_SHAPEKEY; /* Shape Key */ + animchannelTypeInfo[type++] = &ACF_SHAPEKEY; /* ShapeKey */ animchannelTypeInfo[type++] = &ACF_GPD; /* Grease Pencil Datablock */ animchannelTypeInfo[type++] = &ACF_GPL; /* Grease Pencil Layer */ |