[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56604] trunk/blender/source/blender: UI naming consistency:
Thomas Dinges
blender at dingto.org
Wed May 8 23:41:47 CEST 2013
Revision: 56604
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56604
Author: dingto
Date: 2013-05-08 21:41:47 +0000 (Wed, 08 May 2013)
Log Message:
-----------
UI naming consistency:
* ShapeKey -> Shape Key. Was called "Shape Key" in most places already.
Pointed out by Dalai, thanks!
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/include/ED_anim_api.h
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-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -2205,7 +2205,7 @@
}
}
- /* 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);
Modified: trunk/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/ipo.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/blenkernel/intern/ipo.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -319,7 +319,7 @@
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...
*/
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -1550,7 +1550,7 @@
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)
Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -372,9 +372,9 @@
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;
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -2346,9 +2346,9 @@
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 @@
}
}
-/* 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 @@
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 @@
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 */
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -2512,11 +2512,11 @@
/* 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;
}
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -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 @@
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 @@
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 @@
-/* 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 @@
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 @@
}
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))
Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h 2013-05-08 21:41:47 UTC (rev 56604)
@@ -275,7 +275,7 @@
#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)
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_api.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -480,7 +480,7 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2013-05-08 21:05:52 UTC (rev 56603)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2013-05-08 21:41:47 UTC (rev 56604)
@@ -935,7 +935,7 @@
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 @@
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 EnumPropertyItem mode_items[] = {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list