[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56603] trunk/blender/source/blender: UI naming consistency:
Thomas Dinges
blender at dingto.org
Wed May 8 23:05:53 CEST 2013
Revision: 56603
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56603
Author: dingto
Date: 2013-05-08 21:05:52 +0000 (Wed, 08 May 2013)
Log Message:
-----------
UI naming consistency:
* DopeSheet -> Dope Sheet. No need to glue the words together.
Only changed comments and UI strings, no functional changes. Request by Dalai Felinto.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_channels_defines.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/screen/area.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_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c 2013-05-08 21:05:52 UTC (rev 56603)
@@ -427,7 +427,7 @@
static void acf_summary_name(bAnimListElem *UNUSED(ale), char *name)
{
if (name)
- BLI_strncpy(name, IFACE_("DopeSheet Summary"), ANIM_CHAN_NAME_SIZE);
+ BLI_strncpy(name, IFACE_("Dope Sheet Summary"), ANIM_CHAN_NAME_SIZE);
}
// FIXME: this is really a temp icon I think
@@ -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 DopeSheet/Action Editor only
+ * - this is restricted to Dope Sheet/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 DopeSheet's flag */
+ /* return pointer to Dope Sheet's flag */
return GET_ACF_FLAG_PTR(ads->flag, type);
}
else {
@@ -480,7 +480,7 @@
}
}
-/* all animation summary (DopeSheet only) type define */
+/* all animation summary (Dope Sheet 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; /* DopeSheet and elsewhere */
+ AGRP_EXPANDED; /* Dope Sheet and elsewhere */
}
case ACHANNEL_SETTING_MUTE: /* muted */
Modified: trunk/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_filter.c 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/animation/anim_filter.c 2013-05-08 21:05:52 UTC (rev 56603)
@@ -191,7 +191,7 @@
ac->mode = saction->mode;
return 1;
}
- case SACTCONT_DOPESHEET: /* DopeSheet */
+ case SACTCONT_DOPESHEET: /* Dope Sheet */
/* 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 DopeSheet, and gets included at the start of the list
+ * in the Dope Sheet, and gets included at the start of the list
*/
ale->key_data = NULL;
ale->datatype = ALE_ALL;
@@ -2267,7 +2267,7 @@
/* check that we do indeed have a scene */
if ((ads->source == NULL) || (GS(ads->source->name) != ID_SCE)) {
- printf("DopeSheet Error: Not scene!\n");
+ printf("Dope Sheet Error: No scene!\n");
if (G.debug & G_DEBUG)
printf("\tPointer = %p, Name = '%s'\n", (void *)ads->source, (ads->source) ? ads->source->name : NULL);
return 0;
@@ -2339,14 +2339,14 @@
return items;
}
-/* Summary track for DopeSheet/Action Editor
+/* Summary track for Dope Sheet/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 DopeSheet information to use
+ /* get the Dope Sheet 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 DopeSheet/Action/etc. editors where it is actually useful
+ * - only useful for Dope Sheet/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 @@
/* ......................... */
-/* filter data associated with a channel - usually for handling summary-channels in DopeSheet */
+/* filter data associated with a channel - usually for handling summary-channels in Dope Sheet */
static size_t animdata_filter_animchan(bAnimContext *ac, ListBase *anim_data, bDopeSheet *ads, bAnimListElem *channel, int filter_mode)
{
size_t items = 0;
@@ -2499,7 +2499,7 @@
SpaceAction *saction = (SpaceAction *)ac->sl;
bDopeSheet *ads = (saction) ? &saction->ads : NULL;
- /* the check for the DopeSheet summary is included here since the summary works here too */
+ /* 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))
items += animfilter_action(ac, anim_data, ads, data, filter_mode, (ID *)obact);
}
@@ -2507,7 +2507,7 @@
case ANIMCONT_SHAPEKEY: /* 'ShapeKey Editor' */
{
- /* the check for the DopeSheet summary is included here since the summary works here too */
+ /* 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))
items = animdata_filter_shapekey(ac, anim_data, data, filter_mode);
}
@@ -2527,9 +2527,9 @@
}
break;
- case ANIMCONT_DOPESHEET: /* 'DopeSheet Editor' */
+ case ANIMCONT_DOPESHEET: /* 'Dope Sheet Editor' */
{
- /* the DopeSheet editor is the primary place where the DopeSheet summaries are useful */
+ /* the Dope Sheet editor is the primary place where the Dope Sheet 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 @@
case ANIMCONT_DRIVERS: /* Graph Editor -> Drivers Editing */
case ANIMCONT_NLA: /* NLA Editor */
{
- /* all of these editors use the basic DopeSheet data for filtering options, but don't have all the same features */
+ /* all of these editors use the basic Dope Sheet data for filtering options, but don't have all the same features */
items = animdata_filter_dopesheet(ac, anim_data, data, filter_mode);
}
break;
Modified: trunk/blender/source/blender/editors/animation/keyframes_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_draw.c 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/animation/keyframes_draw.c 2013-05-08 21:05:52 UTC (rev 56603)
@@ -672,7 +672,7 @@
/* draw keys */
if (keys) {
- /* locked channels are less strongly shown, as feedback for locked channels in DopeSheet */
+ /* locked channels are less strongly shown, as feedback for locked channels in Dope Sheet */
/* TODO: allow this opacity factor to be themed? */
float kalpha = (channelLocked) ? 0.25f : 1.0f;
Modified: trunk/blender/source/blender/editors/animation/keyframes_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_edit.c 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/animation/keyframes_edit.c 2013-05-08 21:05:52 UTC (rev 56603)
@@ -345,7 +345,7 @@
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' (DopeSheet summary) */
+ case ALE_ALL: /* 'all' (Dope Sheet summary) */
return summary_keyframes_loop(ked, (bAnimContext *)ale->data, key_ok, key_cb, fcu_cb);
}
@@ -377,7 +377,7 @@
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' (DopeSheet summary) */
+ case ALE_ALL: /* 'all' (Dope Sheet summary) */
return summary_keyframes_loop(ked, (bAnimContext *)data, key_ok, key_cb, fcu_cb);
}
Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h 2013-05-08 21:05:52 UTC (rev 56603)
@@ -78,7 +78,7 @@
struct SpaceLink *sl; /* editor data */
struct ARegion *ar; /* region within editor */
- struct bDopeSheet *ads; /* dopesheet data for editor (or which is being used) */
+ struct bDopeSheet *ads; /* dope sheet data for editor (or which is being used) */
struct Scene *scene; /* active scene */
struct Object *obact; /* active object */
Modified: trunk/blender/source/blender/editors/include/ED_keyframes_draw.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_keyframes_draw.h 2013-05-08 19:49:09 UTC (rev 56602)
+++ trunk/blender/source/blender/editors/include/ED_keyframes_draw.h 2013-05-08 21:05:52 UTC (rev 56603)
@@ -118,7 +118,7 @@
void draw_object_channel(struct View2D *v2d, struct bDopeSheet *ads, struct Object *ob, float ypos);
/* Scene Summary */
void draw_scene_channel(struct View2D *v2d, struct bDopeSheet *ads, struct Scene *sce, float ypos);
-/* DopeSheet Summary */
+/* Dope Sheet Summary */
void draw_summary_channel(struct View2D *v2d, struct bAnimContext *ac, float ypos);
/* Grease Pencil Layer */
// XXX not restored
@@ -137,7 +137,7 @@
void ob_to_keylist(struct bDopeSheet *ads, struct Object *ob, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
/* Scene */
void scene_to_keylist(struct bDopeSheet *ads, struct Scene *sce, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
-/* DopeSheet Summary */
+/* Dope Sheet Summary */
void summary_to_keylist(struct bAnimContext *ac, struct DLRBT_Tree *keys, struct DLRBT_Tree *blocks);
/* Grease Pencil Layer */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list