From e0edac4952a26a2e6e627a74ad84c8bba2886e80 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 8 May 2013 21:41:47 +0000 Subject: UI naming consistency: * ShapeKey -> Shape Key. Was called "Shape Key" in most places already. Pointed out by Dalai, thanks! --- source/blender/editors/animation/anim_channels_defines.c | 10 +++++----- source/blender/editors/animation/anim_channels_edit.c | 4 ++-- source/blender/editors/animation/anim_filter.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/editors/animation') diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 8169905232b..368fc711885 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2346,9 +2346,9 @@ static bAnimChannelType ACF_DSSPK = acf_dsspk_setting_ptr /* pointer for setting */ }; -/* ShapeKey Entry ------------------------------------------- */ +/* Shape Key Entry ------------------------------------------- */ -/* name for ShapeKey */ +/* name for Shape Key */ 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 ShapeKey entries */ +/* name property for Shape Key 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; /* ShapeKey Channel */ + animchannelTypeInfo[type++] = &ACF_DSSKEY; /* Shape Key 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; /* ShapeKey */ + animchannelTypeInfo[type++] = &ACF_SHAPEKEY; /* Shape Key */ animchannelTypeInfo[type++] = &ACF_GPD; /* Grease Pencil Datablock */ animchannelTypeInfo[type++] = &ACF_GPL; /* Grease Pencil Layer */ diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 481430f37e4..04e1f05ad79 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2512,11 +2512,11 @@ static int mouse_anim_channels(bAnimContext *ac, float UNUSED(x), int channel_in /* select/deselect */ if (selectmode == SELECT_INVERT) { - /* inverse selection status of this ShapeKey only */ + /* inverse selection status of this Shape Key only */ kb->flag ^= KEYBLOCK_SEL; } else { - /* select ShapeKey by itself */ + /* select Shape Key by itself */ ANIM_deselect_anim_channels(ac, ac->data, ac->datatype, 0, ACHANNEL_SETFLAG_CLEAR); kb->flag |= KEYBLOCK_SEL; } diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 258ba0a68b7..ed00261afe7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -99,7 +99,7 @@ /* ----------- Private Stuff - Action Editor ------------- */ -/* Get shapekey data being edited (for Action Editor -> ShapeKey mode) */ +/* Get shape key data being edited (for Action Editor -> Shape Key mode) */ /* Note: there's a similar function in key.c (BKE_key_from_object) */ static Key *actedit_get_shapekeys(bAnimContext *ac) { @@ -111,7 +111,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac) if (ob == NULL) return NULL; - /* XXX pinning is not available in 'ShapeKey' mode... */ + /* XXX pinning is not available in 'Shape Key' mode... */ //if (saction->pin) return NULL; /* shapekey data is stored with geometry data */ @@ -148,7 +148,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) ac->mode = saction->mode; return 1; - case SACTCONT_SHAPEKEY: /* 'ShapeKey Editor' */ + case SACTCONT_SHAPEKEY: /* 'Shape Key Editor' */ ac->datatype = ANIMCONT_SHAPEKEY; ac->data = actedit_get_shapekeys(ac); @@ -1331,7 +1331,7 @@ static size_t animfilter_block_data(bAnimContext *ac, ListBase *anim_data, bDope -/* Include ShapeKey Data for ShapeKey Editor */ +/* Include Shape Key Data for Shape Key Editor */ static size_t animdata_filter_shapekey(bAnimContext *ac, ListBase *anim_data, Key *key, int filter_mode) { size_t items = 0; @@ -1340,7 +1340,7 @@ static size_t animdata_filter_shapekey(bAnimContext *ac, ListBase *anim_data, Ke if (filter_mode & ANIMFILTER_LIST_CHANNELS) { KeyBlock *kb; - /* loop through the channels adding ShapeKeys as appropriate */ + /* loop through the channels adding Shape Keys as appropriate */ for (kb = key->block.first; kb; kb = kb->next) { /* skip the first one, since that's the non-animatable basis */ if (kb == key->block.first) continue; @@ -2505,7 +2505,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo } break; - case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */ + case ANIMCONT_SHAPEKEY: /* 'Shape Key Editor' */ { /* the check for the Dope Sheet summary is included here since the summary works here too */ if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items)) -- cgit v1.2.3