From b98550590b7a38e5a87f2d5fe3b2f5692a3d0841 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 8 May 2013 21:05:52 +0000 Subject: 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. --- .../editors/animation/anim_channels_defines.c | 10 ++++----- source/blender/editors/animation/anim_filter.c | 24 +++++++++++----------- source/blender/editors/animation/keyframes_draw.c | 2 +- source/blender/editors/animation/keyframes_edit.c | 4 ++-- source/blender/editors/include/ED_anim_api.h | 2 +- source/blender/editors/include/ED_keyframes_draw.h | 4 ++-- source/blender/editors/interface/resources.c | 6 +++--- source/blender/editors/screen/area.c | 2 +- source/blender/editors/space_graph/space_graph.c | 2 +- source/blender/editors/space_nla/space_nla.c | 2 +- source/blender/makesdna/DNA_action_types.h | 6 +++--- source/blender/makesrna/intern/rna_action.c | 8 ++++---- source/blender/makesrna/intern/rna_gpencil.c | 4 ++-- source/blender/makesrna/intern/rna_mask.c | 4 ++-- source/blender/makesrna/intern/rna_space.c | 14 ++++++------- source/blender/makesrna/intern/rna_userdef.c | 14 ++++++------- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 430e7f719b9..8169905232b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -427,7 +427,7 @@ static void acf_summary_backdrop(bAnimContext *ac, bAnimListElem *ale, float ymi 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 @@ 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 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 @@ static void *acf_summary_setting_ptr(bAnimListElem *ale, int setting, short *typ } } -/* 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 @@ 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; /* DopeSheet and elsewhere */ + AGRP_EXPANDED; /* Dope Sheet and elsewhere */ } case ACHANNEL_SETTING_MUTE: /* muted */ diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index 2561d517a3c..258ba0a68b7 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -191,7 +191,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction) 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 @@ 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 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 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b /* 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 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b 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 @@ 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 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 @@ static short animdata_filter_dopesheet_summary(bAnimContext *ac, ListBase *anim_ /* ......................... */ -/* 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 @@ 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 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 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo 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 @@ size_t ANIM_animdata_filter(bAnimContext *ac, ListBase *anim_data, int filter_mo } 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 @@ 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 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; diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index d9d2180e184..cf141c8c088 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 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; diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index decbc351cad..25051472dba 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' (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 @@ 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' (DopeSheet summary) */ + case ALE_ALL: /* 'all' (Dope Sheet summary) */ return summary_keyframes_loop(ked, (bAnimContext *)data, key_ok, key_cb, fcu_cb); } diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index f698f9b0b11..d36811d2891 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -78,7 +78,7 @@ typedef struct bAnimContext { 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 */ diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index ffee46e30c6..5ffa617d8f5 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -118,7 +118,7 @@ void draw_action_channel(struct View2D *v2d, struct AnimData *adt, struct bActio 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 action_to_keylist(struct AnimData *adt, struct bAction *act, struct DLRBT_T 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 */ // XXX not restored diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index c72d16221a8..79295f87ea8 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1609,10 +1609,10 @@ void init_userdef_do_versions(void) btheme->tima.facedot_size = 2; } - /* DopeSheet - (Object) Channel color */ + /* Dope Sheet - (Object) Channel color */ rgba_char_args_set(btheme->tact.ds_channel, 82, 96, 110, 255); rgba_char_args_set(btheme->tact.ds_subchannel, 124, 137, 150, 255); - /* DopeSheet - Group Channel color (saner version) */ + /* Dope Sheet - Group Channel color (saner version) */ rgba_char_args_set(btheme->tact.group, 79, 101, 73, 255); rgba_char_args_set(btheme->tact.group_active, 135, 177, 125, 255); @@ -1959,7 +1959,7 @@ void init_userdef_do_versions(void) bTheme *btheme; for (btheme = U.themes.first; btheme; btheme = btheme->next) { - /* DopeSheet Summary */ + /* Dope Sheet Summary */ rgba_char_args_set(btheme->tact.anim_active, 204, 112, 26, 102); /* NLA Colors */ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 07049e8c9b2..188340e70a3 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1511,7 +1511,7 @@ static const char *editortype_pup(void) "|Timeline %x15" "|Graph Editor %x2" - "|DopeSheet %x12" + "|Dope Sheet %x12" "|NLA Editor %x13" "|%l" diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 3f9737b3c5d..a955593b91a 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -103,7 +103,7 @@ static SpaceLink *graph_new(const bContext *C) sipo->autosnap = SACTSNAP_FRAME; - /* allocate DopeSheet data for Graph Editor */ + /* allocate Dope Sheet data for Graph Editor */ sipo->ads = MEM_callocN(sizeof(bDopeSheet), "GraphEdit DopeSheet"); sipo->ads->source = (ID *)scene; diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index b3d8d5d5aad..00f70fd9576 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -101,7 +101,7 @@ static SpaceLink *nla_new(const bContext *C) snla = MEM_callocN(sizeof(SpaceNla), "initnla"); snla->spacetype = SPACE_NLA; - /* allocate DopeSheet data for NLA Editor */ + /* allocate Dope Sheet data for NLA Editor */ snla->ads = MEM_callocN(sizeof(bDopeSheet), "NlaEdit DopeSheet"); snla->ads->source = (ID *)scene; diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index eded0b4b76e..a3e646db124 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -455,7 +455,7 @@ typedef enum eActionGroup_Flag { AGRP_ACTIVE = (1 << 1), /* keyframes/channels belonging to it cannot be edited */ AGRP_PROTECTED = (1 << 2), - /* for UI (DopeSheet), sub-channels are shown */ + /* for UI (Dope Sheet), sub-channels are shown */ AGRP_EXPANDED = (1 << 3), /* sub-channels are not evaluated */ AGRP_MUTED = (1 << 4), @@ -529,7 +529,7 @@ typedef struct bDopeSheet { } bDopeSheet; -/* DopeSheet filter-flag */ +/* Dope Sheet filter-flag */ typedef enum eDopeSheet_FilterFlag { /* general filtering */ ADS_FILTER_ONLYSEL = (1 << 0), /* only include channels relating to selected data */ @@ -540,7 +540,7 @@ typedef enum eDopeSheet_FilterFlag { ADS_FILTER_SELEDIT = (1 << 3), /* for Graph Editor - used to indicate whether to include a filtering flag or not */ /* general filtering 2 */ - ADS_FILTER_SUMMARY = (1 << 4), /* for 'DopeSheet' Editors - include 'summary' line */ + ADS_FILTER_SUMMARY = (1 << 4), /* for 'Dope Sheet' Editors - include 'summary' line */ ADS_FILTER_ONLYOBGROUP = (1 << 5), /* only the objects in the specified object group get used */ /* datatype-based filtering */ diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 6ab6b8528f9..454e854b38a 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -268,7 +268,7 @@ static void rna_def_dopesheet(BlenderRNA *brna) RNA_def_struct_sdna(srna, "bDopeSheet"); RNA_def_struct_ui_text(srna, "DopeSheet", "Settings for filtering the channels shown in animation editors"); - /* Source of DopeSheet data */ + /* Source of Dope Sheet data */ /* XXX: make this obsolete? */ prop = RNA_def_property(srna, "source", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "ID"); @@ -338,17 +338,17 @@ static void rna_def_dopesheet(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_ACTION, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); - /* Summary Settings (DopeSheet editors only) */ + /* Summary Settings (Dope Sheet editors only) */ prop = RNA_def_property(srna, "show_summary", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_SUMMARY); - RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (DopeSheet editors only)"); + RNA_def_property_ui_text(prop, "Display Summary", "Display an additional 'summary' line (Dope Sheet editors only)"); RNA_def_property_ui_icon(prop, ICON_BORDERMOVE, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); prop = RNA_def_property(srna, "show_expanded_summary", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_SUMMARY_COLLAPSED); RNA_def_property_ui_text(prop, "Collapse Summary", - "Collapse summary when shown, so all other channels get hidden (DopeSheet editors only)"); + "Collapse summary when shown, so all other channels get hidden (Dope Sheet editors only)"); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index fbf6f921d0d..efe6c08cafe 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -402,7 +402,7 @@ static void rna_def_gpencil_frame(BlenderRNA *brna) prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_SELECT); - RNA_def_property_ui_text(prop, "Select", "Frame is selected for editing in the DopeSheet"); + RNA_def_property_ui_text(prop, "Select", "Frame is selected for editing in the Dope Sheet"); func = RNA_def_function(srna, "clear", "rna_GPencil_frame_clear"); RNA_def_function_ui_description(func, "Remove all the grease pencil frame data"); @@ -536,7 +536,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT); - RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet"); + RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the Dope Sheet"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL); /* XXX keep this option? */ diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 6d43f529e65..a0e281f328a 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -655,10 +655,10 @@ static void rna_def_mask_layer(BlenderRNA *brna) RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); RNA_def_property_update(prop, NC_MASK | NA_EDITED, NULL); - /* select (for dopesheet)*/ + /* select (for Dope Sheet)*/ prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MASK_LAYERFLAG_SELECT); - RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet"); + RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the Dope Sheet"); // RNA_def_property_update(prop, NC_SCREEN | ND_MASK, NULL); /* render settings */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 1207b597651..fc9bab12574 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -69,7 +69,7 @@ EnumPropertyItem space_type_items[] = { {SPACE_INFO, "INFO", 0, "Info", ""}, {SPACE_SEQ, "SEQUENCE_EDITOR", 0, "Sequence Editor", ""}, {SPACE_TEXT, "TEXT_EDITOR", 0, "Text Editor", ""}, - {SPACE_ACTION, "DOPESHEET_EDITOR", 0, "DopeSheet Editor", ""}, + {SPACE_ACTION, "DOPESHEET_EDITOR", 0, "Dope Sheet Editor", ""}, {SPACE_NLA, "NLA_EDITOR", 0, "NLA Editor", ""}, {SPACE_TIME, "TIMELINE", 0, "Timeline", ""}, {SPACE_NODE, "NODE_EDITOR", 0, "Node Editor", ""}, @@ -2541,7 +2541,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) /* XXX: action-editor is currently for object-level only actions, so show that using object-icon hint */ static EnumPropertyItem mode_items[] = { - {SACTCONT_DOPESHEET, "DOPESHEET", ICON_OOPS, "DopeSheet", "Edit all keyframes in scene"}, + {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_GPENCIL, "GPENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Edit timings for all Grease Pencil sketches in file"}, @@ -2552,7 +2552,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) srna = RNA_def_struct(brna, "SpaceDopeSheetEditor", "Space"); RNA_def_struct_sdna(srna, "SpaceAction"); - RNA_def_struct_ui_text(srna, "Space DopeSheet Editor", "DopeSheet space data"); + RNA_def_struct_ui_text(srna, "Space Dope Sheet Editor", "Dope Sheet space data"); /* data */ prop = RNA_def_property(srna, "action", PROP_POINTER, PROP_NONE); @@ -2619,7 +2619,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "dopesheet", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "DopeSheet"); RNA_def_property_pointer_sdna(prop, NULL, "ads"); - RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); + RNA_def_property_ui_text(prop, "Dope Sheet", "Settings for filtering animation data"); /* autosnap */ prop = RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); @@ -2739,11 +2739,11 @@ static void rna_def_space_graph(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pivot Point", "Pivot center for rotation/scaling"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); - /* dopesheet */ + /* Dope Sheet */ prop = RNA_def_property(srna, "dopesheet", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "DopeSheet"); RNA_def_property_pointer_sdna(prop, NULL, "ads"); - RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); + RNA_def_property_ui_text(prop, "Dope Sheet", "Settings for filtering animation data"); /* autosnap */ prop = RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); @@ -2798,7 +2798,7 @@ static void rna_def_space_nla(BlenderRNA *brna) prop = RNA_def_property(srna, "dopesheet", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "DopeSheet"); RNA_def_property_pointer_sdna(prop, NULL, "ads"); - RNA_def_property_ui_text(prop, "DopeSheet", "Settings for filtering animation data"); + RNA_def_property_ui_text(prop, "Dope Sheet", "Settings for filtering animation data"); /* autosnap */ prop = RNA_def_property(srna, "auto_snap", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index dc10c1b4aae..ece46e33763 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1621,13 +1621,13 @@ static void rna_def_userdef_theme_space_graph(BlenderRNA *brna) prop = RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "ds_channel"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "DopeSheet Channel", ""); + RNA_def_property_ui_text(prop, "Dope Sheet Channel", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "ds_subchannel"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", ""); + RNA_def_property_ui_text(prop, "Dope Sheet Sub-Channel", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); } @@ -2211,7 +2211,7 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) srna = RNA_def_struct(brna, "ThemeDopeSheet", NULL); RNA_def_struct_sdna(srna, "ThemeSpace"); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); - RNA_def_struct_ui_text(srna, "Theme DopeSheet", "Theme settings for the DopeSheet"); + RNA_def_struct_ui_text(srna, "Theme Dope Sheet", "Theme settings for the Dope Sheet"); rna_def_userdef_theme_spaces_main(srna); rna_def_userdef_theme_spaces_list_main(srna); @@ -2278,13 +2278,13 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) prop = RNA_def_property(srna, "dopesheet_channel", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "ds_channel"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "DopeSheet Channel", ""); + RNA_def_property_ui_text(prop, "Dope Sheet Channel", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "dopesheet_subchannel", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "ds_subchannel"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "DopeSheet Sub-Channel", ""); + RNA_def_property_ui_text(prop, "Dope Sheet Sub-Channel", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "summary", PROP_FLOAT, PROP_COLOR_GAMMA); @@ -2550,7 +2550,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna) {1, "VIEW_3D", ICON_VIEW3D, "3D View", ""}, {2, "TIMELINE", ICON_TIME, "Timeline", ""}, {3, "GRAPH_EDITOR", ICON_IPO, "Graph Editor", ""}, - {4, "DOPESHEET_EDITOR", ICON_ACTION, "DopeSheet", ""}, + {4, "DOPESHEET_EDITOR", ICON_ACTION, "Dope Sheet", ""}, {5, "NLA_EDITOR", ICON_NLA, "NLA Editor", ""}, {6, "IMAGE_EDITOR", ICON_IMAGE_COL, "UV/Image Editor", ""}, {7, "SEQUENCE_EDITOR", ICON_SEQUENCE, "Video Sequence Editor", ""}, @@ -2618,7 +2618,7 @@ static void rna_def_userdef_themes(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "tact"); RNA_def_property_struct_type(prop, "ThemeDopeSheet"); - RNA_def_property_ui_text(prop, "DopeSheet", ""); + RNA_def_property_ui_text(prop, "Dope Sheet", ""); prop = RNA_def_property(srna, "image_editor", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); -- cgit v1.2.3