UI Messages: Consistent spelling of term "data-block"
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 19 Sep 2016 14:46:20 +0000 (16:46 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 19 Sep 2016 14:50:45 +0000 (16:50 +0200)
Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) )

35 files changed:
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/curve/editfont.c
source/blender/editors/gpencil/gpencil_data.c
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_action/action_data.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/node_add.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_text/text_ops.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/intern/node_common.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

index dbc67d30b35bc477356890207db75644d7f7d8d5..49e5255ecccbf6cd046f93926795f2bba581c75c 100644 (file)
@@ -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);
                                                }
index e60cb3fbedfb3cf31ee6f8db2df760fc4d14390d..93a602b463dabfe4a5ba3702be3a562f2221bbcd 100644 (file)
@@ -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;
                
                /* --- */
index 4cbdf77b11a4e747db4e55971260613238c459c4..5f6ba6c413a474cde63da9c39bcdd4ebea2835ba 100644 (file)
@@ -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;
index b40b51e337f1eb143323bbbb2ad9bf0f252e1137..57e731874b4e299e6b48ee70feb8802c55af0844 100644 (file)
@@ -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;
index 9a786755484685ed8ac34ebeaa97efa481e953fa..7dcbe2cc24c954f0953f33795037650b674844bf 100644 (file)
@@ -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;
 
index 88924495ae55846b444af23f5351f9198aea44e5..c88b03ceaa0f5582c4dd40b4bf28345370b7d51c 100644 (file)
@@ -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;
        }
        
index ac7b6428217b9f1edada5eb652d2513d6c7cbc83..f10b3e6f15783e0bed77338fc34aeae48d451e8f 100644 (file)
@@ -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;
index 50dd219b53c2b9ddf65c93596a2fcd0d024ef5dc..36f65065fa100d815135d34197d1f56b0aff85b9 100644 (file)
@@ -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));
 
index 82c6a14eb7f61e69386026a36727adb23eb4d1c4..79544f80e95274e9bc03dba8dfbd90e94090aa7b 100644 (file)
@@ -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");
index d60c8e8dbd9fbb90840700d3519a811d5a382396..83fde4554b39edbc2a1ffb794f5b4d95b4bbe840 100644 (file)
@@ -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_property_flag(prop, PROP_HIDDEN);
-       RNA_def_string(ot->srna, "name", IMA_DEF_NAME, MAX_ID_NAME - 2, "Name", "Image datablock name");
+       RNA_def_string(ot->srna, "name", IMA_DEF_NAME, MAX_ID_NAME - 2, "Name", "Image data-block name");
        prop = RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, "Width", "Image width", 1, 16384);
        RNA_def_property_subtype(prop, PROP_PIXEL);
        prop = RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, "Height", "Image height", 1, 16384);
index 52c39e5c7a1f33e2694e23dc09f39dcceaf276c4..432918f0e37b5dc741bd435499376b9f2b1772e4 100644 (file)
@@ -813,7 +813,7 @@ static void SOUND_OT_unpack(wmOperatorType *ot)
 
        /* properties */
        RNA_def_enum(ot->srna, "method", rna_enum_unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack");
-       RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Sound Name", "Sound datablock name to unpack"); /* XXX, weark!, will fail with library, name collisions */
+       RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Sound Name", "Sound data-block name to unpack"); /* XXX, weark!, will fail with library, name collisions */
 }
 
 /* ******************************************************* */
index 6755a6316ccea3de18a55016d4a0b6a27882e5fe..fdf2dfe8371f142400b9914c756b56b729efb9cb 100644 (file)
@@ -669,8 +669,8 @@ void ACTION_OT_unlink(wmOperatorType *ot)
        ot->poll = action_unlink_poll;
        
        /* properties */
-       prop = RNA_def_boolean(ot->srna, "force_delete", false, "Force Delete", 
-                              "Clear Fake User and remove copy stashed in this datablock's NLA stack");
+       prop = RNA_def_boolean(ot->srna, "force_delete", false, "Force Delete", "Clear Fake User and remove "
+                              "copy stashed in this data-block's NLA stack");
        RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
index 5b03bdd776178bf2383c20c8e522daf06699f775..da3364d872dd3bca591ba589489d39fbd4634009 100644 (file)
@@ -1106,7 +1106,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
        block = uiLayoutGetBlock(row);
        UI_block_emboss_set(block, UI_EMBOSS_NONE);
        but = uiDefIconButBitC(block, UI_BTYPE_ICON_TOGGLE, SB_PIN_CONTEXT, 0, ICON_UNPINNED, 0, 0, UI_UNIT_X, UI_UNIT_Y, &sbuts->flag,
-                              0, 0, 0, 0, TIP_("Follow context or keep fixed datablock displayed"));
+                              0, 0, 0, 0, TIP_("Follow context or keep fixed data-block displayed"));
        UI_but_flag_disable(but, UI_BUT_UNDO); /* skip undo on screen buttons */
        UI_but_func_set(but, pin_cb, NULL, NULL);
 
index a89d3494af000ac5613c965b261173a0776b835b..b4dd5c4a87fe8466e87fe20d53ee7baca8207e96 100644 (file)
@@ -2546,7 +2546,7 @@ void IMAGE_OT_new(wmOperatorType *ot)
        ot->flag = OPTYPE_UNDO;
 
        /* properties */
-       RNA_def_string(ot->srna, "name", IMA_DEF_NAME, MAX_ID_NAME - 2, "Name", "Image datablock name");
+       RNA_def_string(ot->srna, "name", IMA_DEF_NAME, MAX_ID_NAME - 2, "Name", "Image data-block name");
        prop = RNA_def_int(ot->srna, "width", 1024, 1, INT_MAX, "Width", "Image width", 1, 16384);
        RNA_def_property_subtype(prop, PROP_PIXEL);
        prop = RNA_def_int(ot->srna, "height", 1024, 1, INT_MAX, "Height", "Image height", 1, 16384);
@@ -2847,7 +2847,7 @@ void IMAGE_OT_unpack(wmOperatorType *ot)
        
        /* properties */
        RNA_def_enum(ot->srna, "method", rna_enum_unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack");
-       RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Image Name", "Image datablock name to unpack"); /* XXX, weark!, will fail with library, name collisions */
+       RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Image Name", "Image data-block name to unpack"); /* XXX, weark!, will fail with library, name collisions */
 }
 
 /******************** sample image operator ********************/
index 4f30c049d9d1c854fc0d890db49a86cbaa1d4764..e9c46e9d04b23552c87049c329b856b119976c57 100644 (file)
@@ -425,7 +425,7 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
                /* active animdata block */
                if (nla_panel_context(C, &adt_ptr, NULL, NULL) == 0 || (adt_ptr.data == NULL)) {
                        BKE_report(op->reports, RPT_ERROR, "No active AnimData block to use "
-                                  "(select a datablock expander first or set the appropriate flags on an AnimData block)");
+                                  "(select a data-block expander first or set the appropriate flags on an AnimData block)");
                        return OPERATOR_CANCELLED;
                }
                else {
index 3e7e8ccc3f4a01629894ed5ef99add4dfb565716..1f298373a802f45c1208c76f18d0085114d0ea1c 100644 (file)
@@ -605,8 +605,8 @@ static int nlaedit_add_actionclip_exec(bContext *C, wmOperator *op)
        else if (act->idroot == 0) {
                /* hopefully in this case (i.e. library of userless actions), the user knows what they're doing... */
                BKE_reportf(op->reports, RPT_WARNING,
-                           "Action '%s' does not specify what datablocks it can be used on "
-                           "(try setting the 'ID Root Type' setting from the Datablocks Editor "
+                           "Action '%s' does not specify what data-blocks it can be used on "
+                           "(try setting the 'ID Root Type' setting from the data-blocks editor "
                            "for this action to avoid future problems)",
                            act->id.name + 2);
        }
index b50df02beae4cc9bf8c3b570804159e84f7a3678..d49df2afbd4e7590bb36129949fa6a3643d5dd68 100644 (file)
@@ -382,7 +382,7 @@ void NODE_OT_add_file(wmOperatorType *ot)
        WM_operator_properties_filesel(
                ot, FILE_TYPE_FOLDER | FILE_TYPE_IMAGE | FILE_TYPE_MOVIE, FILE_SPECIAL, FILE_OPENFILE,
                WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA);
-       RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name", "Datablock name to assign");
+       RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME - 2, "Name", "Data-block name to assign");
 }
 
 /* ****************** Add Mask Node Operator  ******************* */
@@ -441,7 +441,7 @@ void NODE_OT_add_mask(wmOperatorType *ot)
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
 
-       RNA_def_string(ot->srna, "name", "Mask", MAX_ID_NAME - 2, "Name", "Datablock name to assign");
+       RNA_def_string(ot->srna, "name", "Mask", MAX_ID_NAME - 2, "Name", "Data-block name to assign");
 }
 
 /********************** New node tree operator *********************/
index d4553b650c529b312077db6b8d9f34f84f7094a5..bc2e9c80b4055c42086b8a982f59b7d6fd14b277 100644 (file)
@@ -835,11 +835,11 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops
 
                                if (id->flag & LIB_FAKEUSER) {
                                        icon = ICON_FILE_TICK;
-                                       tip  = TIP_("Datablock will be retained using a fake user");
+                                       tip  = TIP_("Data-block will be retained using a fake user");
                                }
                                else {
                                        icon = ICON_X;
-                                       tip  = TIP_("Datablock has no users and will be deleted");
+                                       tip  = TIP_("Data-block has no users and will be deleted");
                                }
                                bt = uiDefIconButBitS(block, UI_BTYPE_TOGGLE, LIB_FAKEUSER, 1, icon,
                                                      (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_VIEWX), te->ys, UI_UNIT_X, UI_UNIT_Y,
@@ -852,14 +852,14 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops
                                bt = uiDefBut(block, UI_BTYPE_BUT, 1, buf, 
                                              (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_SELECTX), te->ys, 
                                              UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0,
-                                             TIP_("Number of users of this datablock"));
+                                             TIP_("Number of users of this data-block"));
                                UI_but_flag_enable(bt, but_flag);
                                
                                
                                bt = uiDefButBitS(block, UI_BTYPE_TOGGLE, LIB_FAKEUSER, 1, (id->flag & LIB_FAKEUSER) ? "F" : " ",
                                                  (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X, UI_UNIT_Y,
                                                  &id->flag, 0, 0, 0, 0,
-                                                 TIP_("Datablock has a 'fake' user which will keep it in the file "
+                                                 TIP_("Data-block has a 'fake' user which will keep it in the file "
                                                       "even if nothing else uses it"));
                                UI_but_func_set(bt, restrictbutton_id_user_toggle, id, NULL);
                                UI_but_flag_enable(bt, but_flag);
index 65608c8c15ae2c9cb6f5035266550b40293684a6..8eb53d0d7b9e4c0d219ee2af4b116c4ea18c446b 100644 (file)
@@ -320,7 +320,7 @@ static void id_delete(bContext *C, ReportList *reports, TreeElement *te, TreeSto
        }
        else if (BKE_library_ID_is_indirectly_used(bmain, id) && ID_REAL_USERS(id) <= 1) {
                BKE_reportf(reports, RPT_WARNING,
-                           "Cannot delete id '%s', indirectly used datablocks need at least one user",
+                           "Cannot delete id '%s', indirectly used data-blocks need at least one user",
                            id->name);
                return;
        }
@@ -389,7 +389,7 @@ static int outliner_id_delete_invoke(bContext *C, wmOperator *op, const wmEvent
 
 void OUTLINER_OT_id_delete(wmOperatorType *ot)
 {
-       ot->name = "Delete Datablock";
+       ot->name = "Delete Data-Block";
        ot->idname = "OUTLINER_OT_id_delete";
        ot->description = "Delete the ID under cursor";
 
@@ -422,7 +422,7 @@ static int outliner_id_remap_exec(bContext *C, wmOperator *op)
 
        if (ID_IS_LINKED_DATABLOCK(old_id)) {
                BKE_reportf(op->reports, RPT_WARNING,
-                           "Old ID '%s' is linked from a library, indirect usages of this datablock will not be remapped",
+                           "Old ID '%s' is linked from a library, indirect usages of this data-block will not be remapped",
                            old_id->name);
        }
 
@@ -1942,7 +1942,7 @@ static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEv
 {
        /* present a prompt to informing users that this change is irreversible */
        return WM_operator_confirm_message(C, op,
-                                          "Purging unused datablocks cannot be undone. "
+                                          "Purging unused data-blocks cannot be undone. "
                                           "Click here to proceed...");
 }
 
@@ -1964,7 +1964,7 @@ void OUTLINER_OT_orphans_purge(wmOperatorType *ot)
        /* identifiers */
        ot->idname = "OUTLINER_OT_orphans_purge";
        ot->name = "Purge All";
-       ot->description = "Clear all orphaned datablocks without any users from the file (cannot be undone)";
+       ot->description = "Clear all orphaned data-blocks without any users from the file (cannot be undone)";
        
        /* callbacks */
        ot->invoke = outliner_orphans_purge_invoke;
index e38886abeac189066f41c037741e591f9abf664f..ecb4949350f468067b400862245edee4570c1357 100644 (file)
@@ -900,7 +900,7 @@ static EnumPropertyItem prop_object_op_types[] = {
        {OL_OP_DELETE, "DELETE", 0, "Delete", ""},
        {OL_OP_DELETE_HIERARCHY, "DELETE_HIERARCHY", 0, "Delete Hierarchy", ""},
        {OL_OP_REMAP, "REMAP",   0, "Remap Users",
-        "Make all users of selected datablocks to use instead a new chosen one"},
+        "Make all users of selected data-blocks to use instead a new chosen one"},
        {OL_OP_TOGVIS, "TOGVIS", 0, "Toggle Visible", ""},
        {OL_OP_TOGSEL, "TOGSEL", 0, "Toggle Selectable", ""},
        {OL_OP_TOGREN, "TOGREN", 0, "Toggle Renderable", ""},
@@ -1046,7 +1046,7 @@ static EnumPropertyItem prop_group_op_types[] = {
        {OL_GROUPOP_LINK, "LINK",         0, "Link Group Objects to Scene", ""},
        {OL_GROUPOP_DELETE, "DELETE",     0, "Delete Group", "WARNING: no undo"},
        {OL_GROUPOP_REMAP, "REMAP",       0, "Remap Users",
-        "Make all users of selected datablocks to use instead current (clicked) one"},
+        "Make all users of selected data-blocks to use instead current (clicked) one"},
        {OL_GROUPOP_INSTANCE, "INSTANCE", 0, "Instance Groups in Scene", ""},
        {OL_GROUPOP_TOGVIS, "TOGVIS",     0, "Toggle Visible Group", ""},
        {OL_GROUPOP_TOGSEL, "TOGSEL",     0, "Toggle Selectable", ""},
@@ -1153,9 +1153,9 @@ static EnumPropertyItem prop_id_op_types[] = {
        {OUTLINER_IDOP_SINGLE, "SINGLE", 0, "Make Single User", ""},
        {OUTLINER_IDOP_DELETE, "DELETE", 0, "Delete", "WARNING: no undo"},
        {OUTLINER_IDOP_REMAP, "REMAP", 0, "Remap Users",
-        "Make all users of selected datablocks to use instead current (clicked) one"},
+        "Make all users of selected data-blocks to use instead current (clicked) one"},
        {OUTLINER_IDOP_FAKE_ADD, "ADD_FAKE", 0, "Add Fake User",
-        "Ensure datablock gets saved even if it isn't in use (e.g. for motion and material libraries)"},
+        "Ensure data-block gets saved even if it isn't in use (e.g. for motion and material libraries)"},
        {OUTLINER_IDOP_FAKE_CLEAR, "CLEAR_FAKE", 0, "Clear Fake User", ""},
        {OUTLINER_IDOP_RENAME, "RENAME", 0, "Rename", ""},
        {OUTLINER_IDOP_SELECT_LINKED, "SELECT_LINKED", 0, "Select Linked", ""},
@@ -1476,8 +1476,8 @@ static int outliner_action_set_exec(bContext *C, wmOperator *op)
        else if (act->idroot == 0) {
                /* hopefully in this case (i.e. library of userless actions), the user knows what they're doing... */
                BKE_reportf(op->reports, RPT_WARNING,
-                           "Action '%s' does not specify what datablocks it can be used on "
-                           "(try setting the 'ID Root Type' setting from the Datablocks Editor "
+                           "Action '%s' does not specify what data-blocks it can be used on "
+                           "(try setting the 'ID Root Type' setting from the data-blocks editor "
                            "for this action to avoid future problems)",
                            act->id.name + 2);
        }
index e7428fd79d9995fc5e533b1e64a16b1d5a39706c..83012eac39e16168a9cbd7a2f5cb071b8dd90b48 100644 (file)
@@ -197,7 +197,7 @@ void TEXT_OT_new(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Create Text Block";
        ot->idname = "TEXT_OT_new";
-       ot->description = "Create a new text data block";
+       ot->description = "Create a new text data-block";
        
        /* api callbacks */
        ot->exec = text_new_exec;
@@ -288,7 +288,7 @@ void TEXT_OT_open(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Open Text Block";
        ot->idname = "TEXT_OT_open";
-       ot->description = "Open a new text data block";
+       ot->description = "Open a new text data-block";
 
        /* api callbacks */
        ot->exec = text_open_exec;
@@ -348,7 +348,7 @@ void TEXT_OT_reload(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Reload";
        ot->idname = "TEXT_OT_reload";
-       ot->description = "Reload active text data block from its file";
+       ot->description = "Reload active text data-block from its file";
        
        /* api callbacks */
        ot->exec = text_reload_exec;
@@ -397,7 +397,7 @@ void TEXT_OT_unlink(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Unlink";
        ot->idname = "TEXT_OT_unlink";
-       ot->description = "Unlink active text data block";
+       ot->description = "Unlink active text data-block";
        
        /* api callbacks */
        ot->exec = text_unlink_exec;
@@ -512,7 +512,7 @@ void TEXT_OT_save(wmOperatorType *ot)
        /* identifiers */
        ot->name = "Save";
        ot->idname = "TEXT_OT_save";
-       ot->description = "Save active text data block";
+       ot->description = "Save active text data-block";
 
        /* api callbacks */
        ot->exec = text_save_exec;
@@ -3187,7 +3187,7 @@ void TEXT_OT_to_3d_object(wmOperatorType *ot)
        /* identifiers */
        ot->name = "To 3D Object";
        ot->idname = "TEXT_OT_to_3d_object";
-       ot->description = "Create 3D text object from active text data block";
+       ot->description = "Create 3D text object from active text data-block";
        
        /* api callbacks */
        ot->exec = text_to_3d_object_exec;
index eb9320b3fd6ec4b1a6638f8fd1f1216e79f55dda..7e6bdf970f6d737aa7976e412f178fdcfe13c288 100644 (file)
@@ -821,20 +821,20 @@ static void rna_def_ID_materials(BlenderRNA *brna)
 
        func = RNA_def_function(srna, "append", "rna_IDMaterials_append_id");
        RNA_def_function_flag(func, FUNC_USE_MAIN);
-       RNA_def_function_ui_description(func, "Add a new material to the data block");
+       RNA_def_function_ui_description(func, "Add a new material to the data-block");
        parm = RNA_def_pointer(func, "material", "Material", "", "Material to add");
        RNA_def_property_flag(parm, PROP_REQUIRED);
 
        func = RNA_def_function(srna, "pop", "rna_IDMaterials_pop_id");
        RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_MAIN);
-       RNA_def_function_ui_description(func, "Remove a material from the data block");
+       RNA_def_function_ui_description(func, "Remove a material from the data-block");
        parm = RNA_def_int(func, "index", -1, -MAXMAT, MAXMAT, "", "Index of material to remove", 0, MAXMAT);
        RNA_def_boolean(func, "update_data", 0, "", "Update data by re-adjusting the material slots assigned");
        parm = RNA_def_pointer(func, "material", "Material", "", "Material to remove");
        RNA_def_function_return(func, parm);
 
        func = RNA_def_function(srna, "clear", "rna_IDMaterials_clear_id");
-       RNA_def_function_ui_description(func, "Remove all materials from the data block");
+       RNA_def_function_ui_description(func, "Remove all materials from the data-block");
        RNA_def_boolean(func, "update_data", 0, "", "Update data by re-adjusting the material slots assigned");
 }
 
@@ -960,12 +960,12 @@ static void rna_def_ID(BlenderRNA *brna)
        prop = RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "tag", LIB_TAG_ID_RECALC);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Is Updated", "Datablock is tagged for recalculation");
+       RNA_def_property_ui_text(prop, "Is Updated", "Data-block is tagged for recalculation");
 
        prop = RNA_def_property(srna, "is_updated_data", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "tag", LIB_TAG_ID_RECALC_DATA);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "Is Updated Data", "Datablock data is tagged for recalculation");
+       RNA_def_property_ui_text(prop, "Is Updated Data", "Data-block data is tagged for recalculation");
 
        prop = RNA_def_property(srna, "is_library_indirect", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "tag", LIB_TAG_INDIRECT);
@@ -1004,7 +1004,7 @@ static void rna_def_ID(BlenderRNA *brna)
        parm = RNA_def_pointer(func, "id", "ID", "", "ID to count usages");
        RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
        parm = RNA_def_int(func, "count", 0, 0, INT_MAX,
-                          "", "Number of usages/references of given id by current datablock", 0, INT_MAX);
+                          "", "Number of usages/references of given id by current data-block", 0, INT_MAX);
        RNA_def_function_return(func, parm);
 
        func = RNA_def_function(srna, "animation_data_create", "rna_ID_animation_data_create");
@@ -1050,7 +1050,7 @@ static void rna_def_library(BlenderRNA *brna)
 
        func = RNA_def_function(srna, "reload", "WM_lib_reload");
        RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_CONTEXT);
-       RNA_def_function_ui_description(func, "Reload this library and all its linked datablocks");
+       RNA_def_function_ui_description(func, "Reload this library and all its linked data-blocks");
 }
 void RNA_def_ID(BlenderRNA *brna)
 {
index 8d7e47e84029c6120704b3dda23465e985417e96..3f2c0f3d43414065e6d11eb37057a85263fd9ca4 100644 (file)
@@ -310,8 +310,8 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "use_datablock_sort", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ADS_FLAG_NO_DB_SORT);
-       RNA_def_property_ui_text(prop, "Sort Datablocks",
-                                "Alphabetically sorts datablocks - mainly objects in the scene "
+       RNA_def_property_ui_text(prop, "Sort Data-Blocks",
+                                "Alphabetically sorts data-blocks - mainly objects in the scene "
                                 "(disable to increase viewport speed)");
        RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
@@ -377,7 +377,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        prop = RNA_def_property(srna, "show_missing_nla", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NLA_NOACT);
        RNA_def_property_ui_text(prop, "Include Missing NLA",
-                                "Include animation data blocks with no NLA data (NLA editor only)");
+                                "Include animation data-blocks with no NLA data (NLA editor only)");
        RNA_def_property_ui_icon(prop, ICON_ACTION, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
        
@@ -516,7 +516,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
        prop = RNA_def_property(srna, "show_gpencil_3d_only", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "filterflag", ADS_FILTER_GP_3DONLY);
        RNA_def_property_ui_text(prop, "Active Scene Only", 
-                                "Only show Grease Pencil datablocks used as part of the active scene");
+                                "Only show Grease Pencil data-blocks used as part of the active scene");
        RNA_def_property_ui_icon(prop, ICON_SCENE_DATA, 0);
        RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 }
index 7a1954036e353e265f5c9e58d6327175df31e745..e37affcf5a319074634815fb03c618f447babf40 100644 (file)
@@ -806,7 +806,7 @@ static void rna_def_keyingset_paths(BlenderRNA *brna, PropertyRNA *cprop)
        parm = RNA_def_pointer(func, "ksp", "KeyingSetPath", "New Path", "Path created and added to the Keying Set");
        RNA_def_function_return(func, parm);
        /* ID-block for target */
-       parm = RNA_def_pointer(func, "target_id", "ID", "Target ID", "ID-Datablock for the destination");
+       parm = RNA_def_pointer(func, "target_id", "ID", "Target ID", "ID data-block for the destination");
        RNA_def_property_flag(parm, PROP_REQUIRED);
        /* rna-path */
        /* XXX hopefully this is long enough */
index 502e22e2c0795b281db31b58da8c50fa429243a2..f20e8fb8ed4b33e87f82e9db277856468d198698 100644 (file)
@@ -797,7 +797,7 @@ static void rna_def_key(BlenderRNA *brna)
        prop = RNA_def_property(srna, "user", PROP_POINTER, PROP_NONE);
        RNA_def_property_flag(prop, PROP_NEVER_NULL);
        RNA_def_property_pointer_sdna(prop, NULL, "from");
-       RNA_def_property_ui_text(prop, "User", "Datablock using these shape keys");
+       RNA_def_property_ui_text(prop, "User", "Data-block using these shape keys");
 
        prop = RNA_def_property(srna, "use_relative", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "type", KEY_RELATIVE);
index bf016191c61fd38099b5eea8a7e78ad909069529..d432f086dbaf9ed2d0543a2064d8bdfd6a3dcf2a 100644 (file)
@@ -335,39 +335,39 @@ void RNA_def_main(BlenderRNA *brna)
 
        /* plural must match idtypes in readblenentry.c */
        MainCollectionDef lists[] = {
-               {"cameras", "Camera", "rna_Main_camera_begin", "Cameras", "Camera datablocks", RNA_def_main_cameras},
-               {"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene datablocks", RNA_def_main_scenes},
-               {"objects", "Object", "rna_Main_object_begin", "Objects", "Object datablocks", RNA_def_main_objects},
-               {"materials", "Material", "rna_Main_mat_begin", "Materials", "Material datablocks", RNA_def_main_materials},
-               {"node_groups", "NodeTree", "rna_Main_nodetree_begin", "Node Groups", "Node group datablocks", RNA_def_main_node_groups},
-               {"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh datablocks", RNA_def_main_meshes},
-               {"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp datablocks", RNA_def_main_lamps},
-               {"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library datablocks", RNA_def_main_libraries},
-               {"screens", "Screen", "rna_Main_screen_begin", "Screens", "Screen datablocks", RNA_def_main_screens},
-               {"window_managers", "WindowManager", "rna_Main_wm_begin", "Window Managers", "Window manager datablocks", RNA_def_main_window_managers},
-               {"images", "Image", "rna_Main_image_begin", "Images", "Image datablocks", RNA_def_main_images},
-               {"lattices", "Lattice", "rna_Main_latt_begin", "Lattices", "Lattice datablocks", RNA_def_main_lattices},
-               {"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve datablocks", RNA_def_main_curves},
-               {"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs", "Metaball datablocks", RNA_def_main_metaballs},
-               {"fonts", "VectorFont", "rna_Main_font_begin", "Vector Fonts", "Vector font datablocks", RNA_def_main_fonts},
-               {"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture datablocks", RNA_def_main_textures},
-               {"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush datablocks", RNA_def_main_brushes},
-               {"worlds", "World", "rna_Main_world_begin", "Worlds", "World datablocks", RNA_def_main_worlds},
-               {"groups", "Group", "rna_Main_group_begin", "Groups", "Group datablocks", RNA_def_main_groups},
-               {"shape_keys", "Key", "rna_Main_key_begin", "Shape Keys", "Shape Key datablocks", NULL},
-               {"texts", "Text", "rna_Main_text_begin", "Texts", "Text datablocks", RNA_def_main_texts},
-               {"speakers", "Speaker", "rna_Main_speaker_begin", "Speakers", "Speaker datablocks", RNA_def_main_speakers},
-               {"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound datablocks", RNA_def_main_sounds},
-               {"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature datablocks", RNA_def_main_armatures},
-               {"actions", "Action", "rna_Main_action_begin", "Actions", "Action datablocks", RNA_def_main_actions},
-               {"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle datablocks", RNA_def_main_particles},
-               {"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette datablocks", RNA_def_main_palettes},
-               {"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil datablocks", RNA_def_main_gpencil},
-               {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip datablocks", RNA_def_main_movieclips},
-               {"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks datablocks", RNA_def_main_masks},
-               {"linestyles", "FreestyleLineStyle", "rna_Main_linestyle_begin", "Line Styles", "Line Style datablocks", RNA_def_main_linestyles},
-               {"cache_files", "CacheFile", "rna_Main_cachefiles_begin", "Cache Files", "Cache Files datablocks", RNA_def_main_cachefiles},
-               {"paint_curves", "PaintCurve", "rna_Main_paintcurves_begin", "Paint Curves", "Paint Curves datablocks", RNA_def_main_paintcurves},
+               {"cameras", "Camera", "rna_Main_camera_begin", "Cameras", "Camera data-blocks", RNA_def_main_cameras},
+               {"scenes", "Scene", "rna_Main_scene_begin", "Scenes", "Scene data-blocks", RNA_def_main_scenes},
+               {"objects", "Object", "rna_Main_object_begin", "Objects", "Object data-blocks", RNA_def_main_objects},
+               {"materials", "Material", "rna_Main_mat_begin", "Materials", "Material data-blocks", RNA_def_main_materials},
+               {"node_groups", "NodeTree", "rna_Main_nodetree_begin", "Node Groups", "Node group data-blocks", RNA_def_main_node_groups},
+               {"meshes", "Mesh", "rna_Main_mesh_begin", "Meshes", "Mesh data-blocks", RNA_def_main_meshes},
+               {"lamps", "Lamp", "rna_Main_lamp_begin", "Lamps", "Lamp data-blocks", RNA_def_main_lamps},
+               {"libraries", "Library", "rna_Main_library_begin", "Libraries", "Library data-blocks", RNA_def_main_libraries},
+               {"screens", "Screen", "rna_Main_screen_begin", "Screens", "Screen data-blocks", RNA_def_main_screens},
+               {"window_managers", "WindowManager", "rna_Main_wm_begin", "Window Managers", "Window manager data-blocks", RNA_def_main_window_managers},
+               {"images", "Image", "rna_Main_image_begin", "Images", "Image data-blocks", RNA_def_main_images},
+               {"lattices", "Lattice", "rna_Main_latt_begin", "Lattices", "Lattice data-blocks", RNA_def_main_lattices},
+               {"curves", "Curve", "rna_Main_curve_begin", "Curves", "Curve data-blocks", RNA_def_main_curves},
+               {"metaballs", "MetaBall", "rna_Main_mball_begin", "Metaballs", "Metaball data-blocks", RNA_def_main_metaballs},
+               {"fonts", "VectorFont", "rna_Main_font_begin", "Vector Fonts", "Vector font data-blocks", RNA_def_main_fonts},
+               {"textures", "Texture", "rna_Main_tex_begin", "Textures", "Texture data-blocks", RNA_def_main_textures},
+               {"brushes", "Brush", "rna_Main_brush_begin", "Brushes", "Brush data-blocks", RNA_def_main_brushes},
+               {"worlds", "World", "rna_Main_world_begin", "Worlds", "World data-blocks", RNA_def_main_worlds},
+               {"groups", "Group", "rna_Main_group_begin", "Groups", "Group data-blocks", RNA_def_main_groups},
+               {"shape_keys", "Key", "rna_Main_key_begin", "Shape Keys", "Shape Key data-blocks", NULL},
+               {"texts", "Text", "rna_Main_text_begin", "Texts", "Text data-blocks", RNA_def_main_texts},
+               {"speakers", "Speaker", "rna_Main_speaker_begin", "Speakers", "Speaker data-blocks", RNA_def_main_speakers},
+               {"sounds", "Sound", "rna_Main_sound_begin", "Sounds", "Sound data-blocks", RNA_def_main_sounds},
+               {"armatures", "Armature", "rna_Main_armature_begin", "Armatures", "Armature data-blocks", RNA_def_main_armatures},
+               {"actions", "Action", "rna_Main_action_begin", "Actions", "Action data-blocks", RNA_def_main_actions},
+               {"particles", "ParticleSettings", "rna_Main_particle_begin", "Particles", "Particle data-blocks", RNA_def_main_particles},
+               {"palettes", "Palette", "rna_Main_palettes_begin", "Palettes", "Palette data-blocks", RNA_def_main_palettes},
+               {"grease_pencil", "GreasePencil", "rna_Main_gpencil_begin", "Grease Pencil", "Grease Pencil data-blocks", RNA_def_main_gpencil},
+               {"movieclips", "MovieClip", "rna_Main_movieclips_begin", "Movie Clips", "Movie Clip data-blocks", RNA_def_main_movieclips},
+               {"masks", "Mask", "rna_Main_masks_begin", "Masks", "Masks data-blocks", RNA_def_main_masks},
+               {"linestyles", "FreestyleLineStyle", "rna_Main_linestyle_begin", "Line Styles", "Line Style data-blocks", RNA_def_main_linestyles},
+               {"cache_files", "CacheFile", "rna_Main_cachefiles_begin", "Cache Files", "Cache Files data-blocks", RNA_def_main_cachefiles},
+               {"paint_curves", "PaintCurve", "rna_Main_paintcurves_begin", "Paint Curves", "Paint Curves data-blocks", RNA_def_main_paintcurves},
                {NULL, NULL, NULL, NULL, NULL, NULL}
        };
 
@@ -375,7 +375,7 @@ void RNA_def_main(BlenderRNA *brna)
        
        srna = RNA_def_struct(brna, "BlendData", NULL);
        RNA_def_struct_ui_text(srna, "Blendfile Data",
-                              "Main data structure representing a .blend file and all its datablocks");
+                              "Main data structure representing a .blend file and all its data-blocks");
        RNA_def_struct_ui_icon(srna, ICON_BLENDER);
 
        prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
index a23d4444861ec1306e24c92dca88b0144424a5e5..faf36d28ff9183b230b2c37606ca201450ec204c 100644 (file)
@@ -632,13 +632,13 @@ static void rna_def_maskParent(BlenderRNA *brna)
 
        /* parent */
        prop = RNA_def_property(srna, "parent", PROP_STRING, PROP_NONE);
-       RNA_def_property_ui_text(prop, "Parent", "Name of parent object in specified data block to which parenting happens");
+       RNA_def_property_ui_text(prop, "Parent", "Name of parent object in specified data-block to which parenting happens");
        RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
        RNA_def_property_update(prop, 0, "rna_Mask_update_parent");
 
        /* sub_parent */
        prop = RNA_def_property(srna, "sub_parent", PROP_STRING, PROP_NONE);
-       RNA_def_property_ui_text(prop, "Sub Parent", "Name of parent sub-object in specified data block to which parenting happens");
+       RNA_def_property_ui_text(prop, "Sub Parent", "Name of parent sub-object in specified data-block to which parenting happens");
        RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2);
        RNA_def_property_update(prop, 0, "rna_Mask_update_parent");
 }
index a37fe049e72adfd9a7fb529d2658cc8c8f98690e..47e9d989dbfba521e84bbc5bb758da66c415c96d 100644 (file)
@@ -8217,9 +8217,9 @@ static void rna_def_nodetree(BlenderRNA *brna)
        RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
        parm = RNA_def_pointer(func, "result_1", "NodeTree", "Node Tree", "Active node tree from context");
        RNA_def_function_output(func, parm);
-       parm = RNA_def_pointer(func, "result_2", "ID", "Owner ID", "ID data block that owns the node tree");
+       parm = RNA_def_pointer(func, "result_2", "ID", "Owner ID", "ID data-block that owns the node tree");
        RNA_def_function_output(func, parm);
-       parm = RNA_def_pointer(func, "result_3", "ID", "From ID", "Original ID data block selected from the context");
+       parm = RNA_def_pointer(func, "result_3", "ID", "From ID", "Original ID data-block selected from the context");
        RNA_def_function_output(func, parm);
 }
 
index f2a1e0a50ab353e15d26a063e6faa721e36fb23e..6a5978ef0d4ed692d08806dd98e18f4a6374a5ae 100644 (file)
@@ -2624,7 +2624,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
        RNA_def_property_enum_bitflag_sdna(prop, NULL, "gpencil_src");
        RNA_def_property_enum_items(prop, gpencil_source_3d_items);
        RNA_def_property_ui_text(prop, "Grease Pencil Source",
-                                "Datablock where active Grease Pencil data is found from");
+                                "Data-block where active Grease Pencil data is found from");
        RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
        
        prop = RNA_def_property(srna, "gpencil_sculpt", PROP_POINTER, PROP_NONE);
@@ -6776,8 +6776,8 @@ void RNA_def_scene(BlenderRNA *brna)
 
        /* Struct definition */
        srna = RNA_def_struct(brna, "Scene", "ID");
-       RNA_def_struct_ui_text(srna, "Scene",
-                              "Scene data block, consisting in objects and defining time and render related settings");
+       RNA_def_struct_ui_text(srna, "Scene", "Scene data-block, consisting in objects and "
+                              "defining time and render related settings");
        RNA_def_struct_ui_icon(srna, ICON_SCENE_DATA);
        RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);
        
index 1c8d4a4c818fcd1986a36a91847f085201f1a667..a7dab0f56f8a9c7484b496685f1fa4301500a754 100644 (file)
@@ -4303,17 +4303,17 @@ static void rna_def_space_node(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "id", PROP_POINTER, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "ID", "Datablock whose nodes are being edited");
+       RNA_def_property_ui_text(prop, "ID", "Data-block whose nodes are being edited");
 
        prop = RNA_def_property(srna, "id_from", PROP_POINTER, PROP_NONE);
        RNA_def_property_pointer_sdna(prop, NULL, "from");
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
-       RNA_def_property_ui_text(prop, "ID From", "Datablock from which the edited data-block is linked");
+       RNA_def_property_ui_text(prop, "ID From", "Data-block from which the edited data-block is linked");
 
        prop = RNA_def_property(srna, "path", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_collection_sdna(prop, NULL, "treepath", NULL);
        RNA_def_property_struct_type(prop, "NodeTreePath");
-       RNA_def_property_ui_text(prop, "Node Tree Path", "Path from the data block to the currently edited node tree");
+       RNA_def_property_ui_text(prop, "Node Tree Path", "Path from the data-block to the currently edited node tree");
        rna_def_space_node_path_api(brna, prop);
 
        prop = RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE);
index 29c0e948a4c0133b71d7a8ba2059ddc788f3bccf..655c265cad05cb098fdee0d04e5f849daed40fc9 100644 (file)
@@ -2835,13 +2835,13 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna)
        prop = RNA_def_property(srna, "active_action", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "anim_active");
        RNA_def_property_array(prop, 4);
-       RNA_def_property_ui_text(prop, "Active Action", "Animation data block has active action");
+       RNA_def_property_ui_text(prop, "Active Action", "Animation data-block has active action");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
        
        prop = RNA_def_property(srna, "active_action_unset", PROP_FLOAT, PROP_COLOR_GAMMA);
        RNA_def_property_float_sdna(prop, NULL, "anim_non_active");
        RNA_def_property_array(prop, 4);
-       RNA_def_property_ui_text(prop, "No Active Action", "Animation data block doesn't have active action");
+       RNA_def_property_ui_text(prop, "No Active Action", "Animation data-block doesn't have active action");
        RNA_def_property_update(prop, 0, "rna_userdef_update");
        
        prop = RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR_GAMMA);
@@ -4576,7 +4576,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
        
        prop = RNA_def_property(srna, "show_hidden_files_datablocks", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_DOT);
-       RNA_def_property_ui_text(prop, "Hide Dot Files/Datablocks", "Hide files/data-blocks that start with a dot (.*)");
+       RNA_def_property_ui_text(prop, "Hide Dot Files/Data-Blocks", "Hide files/data-blocks that start with a dot (.*)");
        
        prop = RNA_def_property(srna, "use_filter_files", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS);
index 12cd93e418bcd7ad67b693b598dcbc398a1d134a..fbc036435f0d43282c25bb4fe6a1109f7529bc88 100644 (file)
@@ -78,7 +78,7 @@ bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identif
 /* groups display their internal tree name as label */
 void node_group_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
-       BLI_strncpy(label, (node->id) ? node->id->name + 2 : IFACE_("Missing Datablock"), maxlen);
+       BLI_strncpy(label, (node->id) ? node->id->name + 2 : IFACE_("Missing Data-Block"), maxlen);
 }
 
 int node_group_poll_instance(bNode *node, bNodeTree *nodetree)
index 3405537a09c0db01f2269ca55f91885add4ced45..e872ec1a524d5273505699d638fd87d17e68bfab 100644 (file)
@@ -466,7 +466,7 @@ static void wm_link_append_properties_common(wmOperatorType *ot, bool is_link)
        /* better not save _any_ settings for this operator */
        /* properties */
        prop = RNA_def_boolean(ot->srna, "link", is_link,
-                              "Link", "Link the objects or datablocks rather than appending");
+                              "Link", "Link the objects or data-blocks rather than appending");
        RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN);
        prop = RNA_def_boolean(ot->srna, "autoselect", true,
                               "Select", "Select new objects");
@@ -675,7 +675,7 @@ static void lib_relocate_do(
                        id_sort_by_name(which_libbase(bmain, GS(old_id->name)), old_id);
 
                        BKE_reportf(reports, RPT_WARNING,
-                                   "Lib Reload: Replacing all references to old datablock '%s' by reloaded one failed, "
+                                   "Lib Reload: Replacing all references to old data-block '%s' by reloaded one failed, "
                                    "old one (%d remaining users) had to be kept and was renamed to '%s'",
                                    new_id->name, old_id->us, old_id->name);
                }
index 7177244611e33ef1c5ec66360e0cb8369f85bcfd..87ef0596e52694b32f628d7361034891c7afc2d0 100644 (file)
@@ -3963,9 +3963,9 @@ static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op))
 
 static void WM_OT_previews_ensure(wmOperatorType *ot)
 {
-       ot->name = "Refresh DataBlock Previews";
+       ot->name = "Refresh Data-Block Previews";
        ot->idname = "WM_OT_previews_ensure";
-       ot->description = "Ensure datablock previews are available and up-to-date "
+       ot->description = "Ensure data-block previews are available and up-to-date "
                          "(to be saved in .blend file, only for some types like materials, textures, etc.)";
 
        ot->exec = previews_ensure_exec;
@@ -4022,9 +4022,9 @@ static int previews_clear_exec(bContext *C, wmOperator *op)
 
 static void WM_OT_previews_clear(wmOperatorType *ot)
 {
-       ot->name = "Clear DataBlock Previews";
+       ot->name = "Clear Data-Block Previews";
        ot->idname = "WM_OT_previews_clear";
-       ot->description = "Clear datablock previews (only for some types like objects, materials, textures, etc.)";
+       ot->description = "Clear data-block previews (only for some types like objects, materials, textures, etc.)";
 
        ot->exec = previews_clear_exec;
        ot->invoke = WM_menu_invoke;
@@ -4032,7 +4032,7 @@ static void WM_OT_previews_clear(wmOperatorType *ot)
        ot->prop = RNA_def_enum_flag(ot->srna, "id_type", preview_id_type_items,
                                     FILTER_ID_SCE | FILTER_ID_OB | FILTER_ID_GR |
                                     FILTER_ID_MA | FILTER_ID_LA | FILTER_ID_WO | FILTER_ID_TE | FILTER_ID_IM,
-                                    "DataBlock Type", "Which datablock previews to clear");
+                                    "Data-Block Type", "Which data-block previews to clear");
 }
 
 /* *************************** Doc from UI ************* */
index edbbf93bf7a484bf604eda16430a57a4979a2412..dd93a6ff4240733fe64a53e84f7ac656225a2701 100644 (file)
@@ -1148,7 +1148,7 @@ int main(
                                                                MEM_freeN(python_code);
                                                        }
                                                        else {
-                                                               fprintf(stderr, "ERROR: cannot yield control to Python: no Python text data block named '%s'\n", python_main);
+                                                               fprintf(stderr, "ERROR: cannot yield control to Python: no Python text data-block named '%s'\n", python_main);
                                                        }
                                                }
                                                else {