Commit: 16ed49b26ec3b181fd72b37bcbce0f96551bc939 Author: Julian Eisel Date: Mon Sep 19 16:46:20 2016 +0200 Branches: master https://developer.blender.org/rB16ed49b26ec3b181fd72b37bcbce0f96551bc939
UI Messages: Consistent spelling of term "data-block" Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) ) =================================================================== M source/blender/blenloader/intern/writefile.c M source/blender/editors/animation/anim_channels_defines.c M source/blender/editors/animation/anim_channels_edit.c M source/blender/editors/curve/editfont.c M source/blender/editors/gpencil/gpencil_data.c M source/blender/editors/interface/interface_anim.c M source/blender/editors/interface/interface_eyedropper.c M source/blender/editors/interface/interface_templates.c M source/blender/editors/object/object_relations.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sound/sound_ops.c M source/blender/editors/space_action/action_data.c M source/blender/editors/space_buttons/buttons_context.c M source/blender/editors/space_image/image_ops.c M source/blender/editors/space_nla/nla_channels.c M source/blender/editors/space_nla/nla_edit.c M source/blender/editors/space_node/node_add.c M source/blender/editors/space_outliner/outliner_draw.c M source/blender/editors/space_outliner/outliner_edit.c M source/blender/editors/space_outliner/outliner_tools.c M source/blender/editors/space_text/text_ops.c M source/blender/makesrna/intern/rna_ID.c M source/blender/makesrna/intern/rna_action.c M source/blender/makesrna/intern/rna_animation.c M source/blender/makesrna/intern/rna_key.c M source/blender/makesrna/intern/rna_main.c M source/blender/makesrna/intern/rna_mask.c M source/blender/makesrna/intern/rna_nodetree.c M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_space.c M source/blender/makesrna/intern/rna_userdef.c M source/blender/nodes/intern/node_common.c M source/blender/windowmanager/intern/wm_files_link.c M source/blender/windowmanager/intern/wm_operators.c M source/gameengine/GamePlayer/ghost/GPG_ghost.cpp =================================================================== diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index dbc67d3..49e5255 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -3949,7 +3949,7 @@ static void write_libraries(WriteData *wd, Main *main) for (id = lbarray[a]->first; id; id = id->next) { if (id->us > 0 && (id->tag & LIB_TAG_EXTERN)) { if (!BKE_idcode_is_linkable(GS(id->name))) { - printf("ERROR: write file: datablock '%s' from lib '%s' is not linkable " + printf("ERROR: write file: data-block '%s' from lib '%s' is not linkable " "but is flagged as directly linked", id->name, main->curlib->filepath); BLI_assert(0); } diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index e60cb3f..93a602b 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -4155,7 +4155,7 @@ static void draw_setting_widget(bAnimContext *ac, bAnimListElem *ale, const bAni case ACHANNEL_SETTING_SOLO: /* NLA Tracks only */ //icon = ((enabled) ? ICON_SOLO_OFF : ICON_SOLO_ON); icon = ICON_SOLO_OFF; - tooltip = TIP_("NLA Track is the only one evaluated in this Animation Data block, with all others muted"); + tooltip = TIP_("NLA Track is the only one evaluated in this animation data-block, with all others muted"); break; /* --- */ diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 4cbdf77..5f6ba6c 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -2145,7 +2145,7 @@ static void ANIM_OT_channels_clean_empty(wmOperatorType *ot) /* identifiers */ ot->name = "Remove Empty Animation Data"; ot->idname = "ANIM_OT_channels_clean_empty"; - ot->description = "Delete all empty animation data containers from visible datablocks"; + ot->description = "Delete all empty animation data containers from visible data-blocks"; /* api callbacks */ ot->exec = animchannels_clean_empty_exec; diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index b40b51e..57e7318 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1788,7 +1788,7 @@ void FONT_OT_unlink(wmOperatorType *ot) /* identifiers */ ot->name = "Unlink"; ot->idname = "FONT_OT_unlink"; - ot->description = "Unlink active font data block"; + ot->description = "Unlink active font data-block"; /* api callbacks */ ot->exec = font_unlink_exec; diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 9a78675..7dcbe2c 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -108,7 +108,7 @@ void GPENCIL_OT_data_add(wmOperatorType *ot) /* identifiers */ ot->name = "Grease Pencil Add New"; ot->idname = "GPENCIL_OT_data_add"; - ot->description = "Add new Grease Pencil datablock"; + ot->description = "Add new Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* callbacks */ @@ -156,7 +156,7 @@ void GPENCIL_OT_data_unlink(wmOperatorType *ot) /* identifiers */ ot->name = "Grease Pencil Unlink"; ot->idname = "GPENCIL_OT_data_unlink"; - ot->description = "Unlink active Grease Pencil datablock"; + ot->description = "Unlink active Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* callbacks */ @@ -197,7 +197,7 @@ void GPENCIL_OT_layer_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add New Layer"; ot->idname = "GPENCIL_OT_layer_add"; - ot->description = "Add new Grease Pencil layer for the active Grease Pencil datablock"; + ot->description = "Add new Grease Pencil layer for the active Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -979,7 +979,7 @@ void GPENCIL_OT_brush_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add Brush"; ot->idname = "GPENCIL_OT_brush_add"; - ot->description = "Add new Grease Pencil drawing brush for the active Grease Pencil datablock"; + ot->description = "Add new Grease Pencil drawing brush for the active Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -1337,7 +1337,7 @@ void GPENCIL_OT_palette_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add Palette"; ot->idname = "GPENCIL_OT_palette_add"; - ot->description = "Add new Grease Pencil palette for the active Grease Pencil datablock"; + ot->description = "Add new Grease Pencil palette for the active Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -1554,7 +1554,7 @@ void GPENCIL_OT_palettecolor_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add Palette Color"; ot->idname = "GPENCIL_OT_palettecolor_add"; - ot->description = "Add new Grease Pencil palette color for the active Grease Pencil datablock"; + ot->description = "Add new Grease Pencil palette color for the active Grease Pencil data-block"; ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index 8892449..c88b03c 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -179,7 +179,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str) id = (ID *)but->rnapoin.id.data; if ((id == NULL) || (GS(id->name) == ID_MA) || (GS(id->name) == ID_TE)) { if (G.debug & G_DEBUG) - printf("ERROR: create expression failed - invalid id-datablock for adding drivers (%p)\n", id); + printf("ERROR: create expression failed - invalid data-block for adding drivers (%p)\n", id); return false; } diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index ac7b642..f10b3e6 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -734,9 +734,9 @@ static int datadropper_poll(bContext *C) void UI_OT_eyedropper_id(wmOperatorType *ot) { /* identifiers */ - ot->name = "Eyedropper Datablock"; + ot->name = "Eyedropper Data-Block"; ot->idname = "UI_OT_eyedropper_id"; - ot->description = "Sample a datablock from the 3D View to store in a property"; + ot->description = "Sample a data-block from the 3D View to store in a property"; /* api callbacks */ ot->invoke = datadropper_invoke; diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 50dd219..36f6506 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -453,12 +453,12 @@ static void template_ID( if (id->lib) { if (id->tag & LIB_TAG_INDIRECT) { but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_INDIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y, - NULL, 0, 0, 0, 0, TIP_("Indirect library datablock, cannot change")); + NULL, 0, 0, 0, 0, TIP_("Indirect library data-block, cannot change")); UI_but_flag_enable(but, UI_BUT_DISABLED); } else { but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_LIBRARY_DATA_DIRECT, 0, 0, UI_UNIT_X, UI_UNIT_Y, - NULL, 0, 0, 0, 0, TIP_("Direct linked library datablock, click to make local")); + NULL, 0, 0, 0, 0, TIP_("Direct linked library data-block, click to make local")); if (!id_make_local(CTX_data_main(C), id, true /* test */, false) || (idfrom && idfrom->lib)) UI_but_flag_enable(but, UI_BUT_DISABLED); } @@ -585,7 +585,7 @@ static void template_ID( else { if ((RNA_property_flag(template->prop) & PROP_NEVER_UNLINK) == 0) { but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0, 0, 0, 0, - TIP_("Unlink datablock " + TIP_("Unlink data-block " "(Shift + Click to set users to zero, data will then not be saved)")); UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template), SET_INT_IN_POINTER(UI_ID_DELETE)); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 82c6a14..79544f8 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2346,7 +2346,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot) /* identifiers */ ot->name = "Make Local"; - ot->description = "Make library linked datablocks local to this file"; + ot->description = "Make library linked data-blocks local to this file"; ot->idname = "OBJECT_OT_make_local"; /* api callbacks */ @@ -2441,7 +2441,7 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot) RNA_def_boolean(ot->srna, "object", 0, "Object", "Make single user objects"); RNA_def_boolean(ot->srna, "obdata", 0, "Object Data", "Make single user object data"); - RNA_def_boolean(ot->srna, "material", 0, "Materials", "Make materials local to each datablock"); + RNA_def_boolean(ot->srna, "material", 0, "Materials", "Make materials local to each data-block"); RNA_def_boolean(ot->srna, "texture", 0, "Textures", "Make textures local to each material (needs 'Materials' to be set too)"); RNA_def_boolean(ot->srna, "animation", 0, "Object Animation", "Make animation data local to each object"); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index d60c8e8..83fde45 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -5783,7 +5783,7 @@ void PAINT_OT_add_texture_paint_slot(wmOperatorType *ot) /* properties */ prop = RNA_def_enum(ot->srna, "type", layer_type_items, 0, "Type", "Merge method to use"); RNA_def_proper @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs