UI naming consistency:

* ShapeKey -> Shape Key. Was called "Shape Key" in most places already.

Pointed out by Dalai, thanks! 

10 files changed, 24 insertions, 24 deletions

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 1bae4ec68cc..6759e10ab4d 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -2205,7 +2205,7 @@ static void dag_id_flush_update(Scene *sce, ID *id)
 			}
 		}
 		
-		/* set flags based on ShapeKey */
+		/* set flags based on Shape Key */
 		if (idtype == ID_KE) {
 			for (obt = bmain->object.first; obt; obt = obt->id.next) {
 				Key *key = BKE_key_from_object(obt);
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 10226ade786..bface916ac3 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -319,7 +319,7 @@ static const char *constraint_adrcodes_to_paths(int adrcode, int *array_index)
 	return NULL;
 }
 
-/* ShapeKey types 
+/* Shape Key types 
  * NOTE: as we don't have access to the keyblock where the data comes from (for now), 
  *       we'll just use numerical indices for now...
  */
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 5c25469facc..2e5e360a67d 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1550,7 +1550,7 @@ void BKE_keyblock_copy_settings(KeyBlock *kb_dst, const KeyBlock *kb_src)
 	kb_dst->slidermax  = kb_src->slidermax;
 }
 
-/* Get RNA-Path for 'value' setting of the given ShapeKey 
+/* Get RNA-Path for 'value' setting of the given Shape Key 
  * NOTE: the user needs to free the returned string once they're finish with it
  */
 char *BKE_keyblock_curval_rnapath_get(Key *key, KeyBlock *kb)
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 859df2f64a1..bdc861e502c 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -372,9 +372,9 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
 					ar->v2d.align = V2D_ALIGN_NO_POS_Y;
 					ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
 
-					/* for old files with ShapeKey editors open + an action set, clear the action as
-					 * it doesn't make sense in the new system (i.e. violates concept that ShapeKey edit
-					 * only shows ShapeKey-rooted actions only)
+					/* for old files with Shape Key editors open + an action set, clear the action as
+					 * it doesn't make sense in the new system (i.e. violates concept that Shape Key edit
+					 * only shows Shape Key-rooted actions only)
 					 */
 					if (saction->mode == SACTCONT_SHAPEKEY)
 						saction->action = NULL;
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))
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index d36811d2891..b64431d5a6b 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -275,7 +275,7 @@ typedef enum eAnimFilter_Flags {
 #define EDITABLE_FCU(fcu) ((fcu->flag & FCURVE_PROTECTED) == 0)
 #define SEL_FCU(fcu) (fcu->flag & FCURVE_SELECTED)
 
-/* ShapeKey mode only */
+/* Shape Key mode only */
 #define EDITABLE_SHAPEKEY(kb) ((kb->flag & KEYBLOCK_LOCKED) == 0)
 #define SEL_SHAPEKEY(kb) (kb->flag & KEYBLOCK_SEL)
 
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index a4e532660f1..f0fa1db4485 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -480,7 +480,7 @@ void RNA_api_object(StructRNA *srna)
 	parm = RNA_def_pointer(func, "ob_arm", "Object", "", "Armature object influencing this object or NULL");
 	RNA_def_function_return(func, parm);
 
-	/* Shape key */
+	/* Shape Key */
 	func = RNA_def_function(srna, "shape_key_add", "rna_Object_shape_key_add");
 	RNA_def_function_ui_description(func, "Add shape key to an object");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index fc9bab12574..58e1468136e 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -935,7 +935,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *sce
 	SpaceAction *saction = (SpaceAction *)(ptr->data);
 	Object *obact = (scene->basact) ? scene->basact->object : NULL;
 	
-	/* special exceptions for ShapeKey Editor mode */
+	/* special exceptions for Shape Key Editor mode */
 	if (saction->mode == SACTCONT_SHAPEKEY) {
 		Key *key = BKE_key_from_object(obact);
 		
@@ -946,7 +946,7 @@ static void rna_SpaceDopeSheetEditor_mode_update(Main *UNUSED(bmain), Scene *sce
 			saction->action = NULL;
 		
 		/* 2)	enable 'show sliders' by default, since one of the main
-		 *		points of the ShapeKey Editor is to provide a one-stop shop
+		 *		points of the Shape Key Editor is to provide a one-stop shop
 		 *		for controlling the shapekeys, whose main control is the value
 		 */
 		saction->flag |= SACTION_SLIDERS;
@@ -2543,7 +2543,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
 	static EnumPropertyItem mode_items[] = {
 		{SACTCONT_DOPESHEET, "DOPESHEET", ICON_OOPS, "Dope Sheet", "Edit all keyframes in scene"},
 		{SACTCONT_ACTION, "ACTION", ICON_OBJECT_DATA, "Action Editor", "Edit keyframes in active object's Object-level action"},
-		{SACTCONT_SHAPEKEY, "SHAPEKEY", ICON_SHAPEKEY_DATA, "ShapeKey Editor", "Edit keyframes in active object's Shape Keys action"},
+		{SACTCONT_SHAPEKEY, "SHAPEKEY", ICON_SHAPEKEY_DATA, "Shape Key Editor", "Edit keyframes in active object's Shape Keys action"},
 		{SACTCONT_GPENCIL, "GPENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Edit timings for all Grease Pencil sketches in file"},
 		{SACTCONT_MASK, "MASK", ICON_MOD_MASK, "Mask", "Edit timings for Mask Editor splines"},
 		{0, NULL, 0, NULL, NULL}