[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56612] trunk/blender/source/blender: Partial revert of own commits r56604 and r56603:

Thomas Dinges blender at dingto.org
Thu May 9 12:03:39 CEST 2013


Revision: 56612
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56612
Author:   dingto
Date:     2013-05-09 10:03:38 +0000 (Thu, 09 May 2013)
Log Message:
-----------
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. 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56604
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56603

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/ipo.c
    trunk/blender/source/blender/blenkernel/intern/key.c
    trunk/blender/source/blender/blenloader/intern/versioning_250.c
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/animation/anim_filter.c
    trunk/blender/source/blender/editors/animation/keyframes_draw.c
    trunk/blender/source/blender/editors/animation/keyframes_edit.c
    trunk/blender/source/blender/editors/include/ED_anim_api.h
    trunk/blender/source/blender/editors/include/ED_keyframes_draw.h
    trunk/blender/source/blender/editors/interface/resources.c
    trunk/blender/source/blender/editors/space_graph/space_graph.c
    trunk/blender/source/blender/editors/space_nla/space_nla.c
    trunk/blender/source/blender/makesdna/DNA_action_types.h
    trunk/blender/source/blender/makesrna/intern/rna_action.c
    trunk/blender/source/blender/makesrna/intern/rna_mask.c
    trunk/blender/source/blender/makesrna/intern/rna_object_api.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -2205,7 +2205,7 @@
 			}
 		}
 		
-		/* set flags based on Shape Key */
+		/* set flags based on ShapeKey */
 		if (idtype == ID_KE) {
 			for (obt = bmain->object.first; obt; obt = obt->id.next) {
 				Key *key = BKE_key_from_object(obt);

Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -319,7 +319,7 @@
 	return NULL;
 }
 
-/* Shape Key types 
+/* ShapeKey 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...
  */

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -1550,7 +1550,7 @@
 	kb_dst->slidermax  = kb_src->slidermax;
 }
 
-/* Get RNA-Path for 'value' setting of the given Shape Key 
+/* Get RNA-Path for 'value' setting of the given ShapeKey 
  * 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)

Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -372,9 +372,9 @@
 					ar->v2d.align = V2D_ALIGN_NO_POS_Y;
 					ar->v2d.flag = V2D_VIEWSYNC_AREA_VERTICAL;
 
-					/* 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)
+					/* 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)
 					 */
 					if (saction->mode == SACTCONT_SHAPEKEY)
 						saction->action = NULL;

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -464,13 +464,13 @@
 	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 @@
 	}
 }
 
-/* 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 @@
 			 */
 			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 @@
 	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 @@
 	}
 }
 
-/* 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 @@
 		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 @@
 		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 */

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -2512,11 +2512,11 @@
 			
 			/* 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;
 			}

Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c	2013-05-09 08:29:59 UTC (rev 56611)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c	2013-05-09 10:03:38 UTC (rev 56612)
@@ -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 @@
 	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 @@
 			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 @@
 			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 @@
 			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 @@
 
 
 
-/* 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 @@
 	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 @@
 	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 @@
 	
 	/* 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)) {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list