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. 

5 files changed, 31 insertions, 31 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 */
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 04e1f05ad79..481430f37e4 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 Shape Key only */
+				/* inverse selection status of this ShapeKey only */
 				kb->flag ^= KEYBLOCK_SEL;
 			}
 			else {
-				/* select Shape Key by itself */
+				/* select ShapeKey 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 ed00261afe7..d46c0a47c23 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 shape key data being edited (for Action Editor -> Shape Key mode) */
+/* Get shapekey data being edited (for Action Editor -> ShapeKey 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 'Shape Key' mode... */
+	/* XXX pinning is not available in 'ShapeKey' 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: /* 'Shape Key Editor' */
+		case SACTCONT_SHAPEKEY: /* 'ShapeKey Editor' */
 			ac->datatype = ANIMCONT_SHAPEKEY;
 			ac->data = actedit_get_shapekeys(ac);
 			
@@ -191,7 +191,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
 			ac->mode = saction->mode;
 			return 1;
 		}
-		case SACTCONT_DOPESHEET: /* Dope Sheet */
+		case SACTCONT_DOPESHEET: /* DopeSheet */
 			/* update scene-pointer (no need to check for pinning yet, as not implemented) */
 			saction->ads.source = (ID *)ac->scene;
 			
@@ -538,7 +538,7 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne
 			case ANIMTYPE_SUMMARY:
 			{
 				/* nothing to include for now... this is just a dummy wrappy around all the other channels 
-				 * in the Dope Sheet, and gets included at the start of the list
+				 * in the DopeSheet, and gets included at the start of the list
 				 */
 				ale->key_data = NULL;
 				ale->datatype = ALE_ALL;
@@ -1331,7 +1331,7 @@ static size_t animfilter_block_data(bAnimContext *ac, ListBase *anim_data, bDope
 
 
 
-/* Include Shape Key Data for Shape Key Editor */
+/* Include ShapeKey Data for ShapeKey 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 Shape Keys as appropriate */
+		/* loop through the channels adding ShapeKeys 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;
@@ -2339,14 +2339,14 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
 	return items;
 }
 
-/* Summary track for Dope Sheet/Action Editor 
+/* Summary track for DopeSheet/Action Editor 
  *  - return code is whether the summary lets the other channels get drawn
  */
 static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_data, int filter_mode, size_t *items)
 {
 	bDopeSheet *ads = NULL;
 	
-	/* get the Dope Sheet information to use 
+	/* get the DopeSheet information to use 
 	 *	- we should only need to deal with the DopeSheet/Action Editor, 
 	 *	  since all the other Animation Editors won't have this concept
 	 *	  being applicable.
@@ -2362,7 +2362,7 @@ static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_
 	
 	/* dopesheet summary 
 	 *	- only for drawing and/or selecting keyframes in channels, but not for real editing 
-	 *	- only useful for Dope Sheet/Action/etc. editors where it is actually useful
+	 *	- only useful for DopeSheet/Action/etc. editors where it is actually useful
 	 */
 	if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && (ads->filterflag & ADS_FILTER_SUMMARY)) {
 		bAnimListElem *ale = make_new_animlistelem(ac, ANIMTYPE_SUMMARY, NULL);
@@ -2384,7 +2384,7 @@ static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_
 
 /* ......................... */
 
-/* filter data associated with a channel - usually for handling summary-channels in Dope Sheet */
+/* filter data associated with a channel - usually for handling summary-channels in DopeSheet */
 static size_t animdata_filter_animchan(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, bAnimListElem *channel, int filter_mode)
 {
 	size_t items = 0;
@@ -2499,15 +2499,15 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 				SpaceAction *saction = (SpaceAction *)ac->sl;
 				bDopeSheet *ads = (saction) ? &saction->ads : NULL;
 				
-				/* the check for the Dope Sheet summary is included here since the summary works here too */
+				/* the check for the DopeSheet summary is included here since the summary works here too */
 				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
 					items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact);
 			}
 			break;
 			
-			case ANIMCONT_SHAPEKEY: /* 'Shape Key Editor' */
+			case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */
 			{
-				/* the check for the Dope Sheet summary is included here since the summary works here too */
+				/* the check for the DopeSheet summary is included here since the summary works here too */
 				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
 					items = animdata_filter_shapekey(ac, anim_data, data, filter_mode);
 			}
@@ -2527,9 +2527,9 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 			}
 			break;
 			
-			case ANIMCONT_DOPESHEET: /* 'Dope Sheet Editor' */
+			case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */
 			{
-				/* the Dope Sheet editor is the primary place where the Dope Sheet summaries are useful */
+				/* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
 				if (animdata_filter_dopesheet_summary(ac, anim_data, filter_mode, &items))
 					items += animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
 			}
@@ -2539,7 +2539,7 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo
 			case ANIMCONT_DRIVERS: /* Graph Editor -> Drivers Editing */
 			case ANIMCONT_NLA:     /* NLA Editor */
 			{
-				/* all of these editors use the basic Dope Sheet data for filtering options, but don't have all the same features */
+				/* all of these editors use the basic DopeSheet data for filtering options, but don't have all the same features */
 				items = animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
 			}
 			break;
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index cf141c8c088..d9d2180e184 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -672,7 +672,7 @@ static void draw_keylist(View2D *v2d, DLRBT_Tree *keys, DLRBT_Tree *blocks, floa
 	
 	/* draw keys */
 	if (keys) {
-		/* locked channels are less strongly shown, as feedback for locked channels in Dope Sheet */
+		/* locked channels are less strongly shown, as feedback for locked channels in DopeSheet */
 		/* TODO: allow this opacity factor to be themed? */
 		float kalpha = (channelLocked) ? 0.25f : 1.0f;
 		
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 25051472dba..decbc351cad 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -345,7 +345,7 @@ short ANIM_animchannel_keyframes_loop(KeyframeEditData *ked, bDopeSheet *ads, bA
 			return ob_keyframes_loop(ked, ads, (Object *)ale->key_data, key_ok, key_cb, fcu_cb);
 		case ALE_SCE: /* scene */
 			return scene_keyframes_loop(ked, ads, (Scene *)ale->data, key_ok, key_cb, fcu_cb);
-		case ALE_ALL: /* 'all' (Dope Sheet summary) */
+		case ALE_ALL: /* 'all' (DopeSheet summary) */
 			return summary_keyframes_loop(ked, (bAnimContext *)ale->data, key_ok, key_cb, fcu_cb);
 	}
 	
@@ -377,7 +377,7 @@ short ANIM_animchanneldata_keyframes_loop(KeyframeEditData *ked, bDopeSheet *ads
 			return ob_keyframes_loop(ked, ads, (Object *)data, key_ok, key_cb, fcu_cb);
 		case ALE_SCE: /* scene */
 			return scene_keyframes_loop(ked, ads, (Scene *)data, key_ok, key_cb, fcu_cb);
-		case ALE_ALL: /* 'all' (Dope Sheet summary) */
+		case ALE_ALL: /* 'all' (DopeSheet summary) */
 			return summary_keyframes_loop(ked, (bAnimContext *)data, key_ok, key_cb, fcu_cb);
 	}