From 53cae68ee88b54a5f6093dfb912897ce65c12b9d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Aug 2025 08:47:13 +1000 Subject: [PATCH] Cleanup: hyphenate the term data-blocks in strings/doc-strings --- doc/blender_file_format/BlendFileReader.py | 2 +- doc/python_api/examples/bpy.msgbus.1.py | 2 +- scripts/modules/bpy_extras/id_map_utils.py | 2 +- scripts/modules/bpy_extras/image_utils.py | 2 +- scripts/startup/bl_operators/anim.py | 2 +- .../intern/blendfile_link_append.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 2 +- .../intern/eval/deg_eval_copy_on_write.cc | 2 +- .../editors/object/object_relations.cc | 2 +- source/blender/editors/space_node/node_add.cc | 2 +- source/blender/makesrna/intern/rna_ID.cc | 10 +-- .../blender/makesrna/intern/rna_depsgraph.cc | 2 +- .../blender/makesrna/intern/rna_main_api.cc | 88 +++++++++++-------- source/blender/makesrna/intern/rna_space.cc | 4 +- .../blender/makesrna/intern/rna_text_api.cc | 2 +- .../composite/nodes/node_composite_mask.cc | 2 +- .../nodes/node_composite_movieclip.cc | 2 +- source/blender/python/bmesh/bmesh_py_types.cc | 4 +- source/blender/python/gpu/gpu_py_texture.cc | 4 +- .../blender/python/intern/bpy_app_handlers.cc | 10 +-- source/blender/python/intern/bpy_rna.cc | 10 +-- .../windowmanager/intern/wm_files_link.cc | 4 +- 22 files changed, 87 insertions(+), 75 deletions(-) diff --git a/doc/blender_file_format/BlendFileReader.py b/doc/blender_file_format/BlendFileReader.py index d9eb808be38..4771ae9b0f2 100644 --- a/doc/blender_file_format/BlendFileReader.py +++ b/doc/blender_file_format/BlendFileReader.py @@ -216,7 +216,7 @@ class FileBlockHeader: OldAddress (pointer) SDNAIndex (int) Count (int) - FileOffset (= file pointer of datablock) + FileOffset (= file pointer of data-block) ''' def __init__(self, handle, fileheader): diff --git a/doc/python_api/examples/bpy.msgbus.1.py b/doc/python_api/examples/bpy.msgbus.1.py index c33d5788ddf..0314491ade2 100644 --- a/doc/python_api/examples/bpy.msgbus.1.py +++ b/doc/python_api/examples/bpy.msgbus.1.py @@ -1,6 +1,6 @@ """ The message bus system can be used to receive notifications when properties of -Blender datablocks are changed via the data API. +Blender data-blocks are changed via the data API. Limitations diff --git a/scripts/modules/bpy_extras/id_map_utils.py b/scripts/modules/bpy_extras/id_map_utils.py index 7eaed354c31..b1d72840601 100644 --- a/scripts/modules/bpy_extras/id_map_utils.py +++ b/scripts/modules/bpy_extras/id_map_utils.py @@ -10,7 +10,7 @@ __all__ = ( def get_id_reference_map(): # `-> dict[bpy.types.ID, set[bpy.types.ID]]` - """Return a dictionary of direct datablock references for every datablock in the blend file.""" + """Return a dictionary of direct data-block references for every data-block in the blend file.""" import bpy inv_map = {} diff --git a/scripts/modules/bpy_extras/image_utils.py b/scripts/modules/bpy_extras/image_utils.py index b6218d36c4e..92572a49014 100644 --- a/scripts/modules/bpy_extras/image_utils.py +++ b/scripts/modules/bpy_extras/image_utils.py @@ -48,7 +48,7 @@ def load_image( :arg relpath: If not None, make the file relative to this path. :type relpath: str | None :arg check_existing: If true, - returns already loaded image datablock if possible + returns already loaded image data-block if possible (based on file path). :type check_existing: bool :arg force_reload: If true, diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index b99cb20295a..45d449d6f78 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -454,7 +454,7 @@ class UpdateAnimatedTransformConstraint(Operator): print(log) text = bpy.data.texts.new("UpdateAnimatedTransformConstraint Report") text.from_string(log) - self.report({'INFO'}, rpt_("Complete report available on '{:s}' text datablock").format(text.name)) + self.report({'INFO'}, rpt_("Complete report available on '{:s}' text data-block").format(text.name)) return {'FINISHED'} diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 4d5a157750f..3f4164def68 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -1982,7 +1982,7 @@ void BKE_blendfile_library_relocate(BlendfileLinkAppendContext *lapp_context, lapp_context, BKE_id_name(*id), idcode, id); item->libraries.fill(true); - CLOG_DEBUG(&LOG, "Datablock to seek for: %s", id->name); + CLOG_DEBUG(&LOG, "Data-block to seek for: %s", id->name); } } } diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index e0d8e85e797..5f04c9773f7 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -3018,7 +3018,7 @@ static bool read_libblock_undo_restore( if (id_old != nullptr && read_libblock_is_identical(fd, bhead)) { /* Local datablock was unchanged, restore from the old main. */ CLOG_DEBUG(&LOG_UNDO, - "UNDO: read %s (uid %u) -> keep identical datablock", + "UNDO: read %s (uid %u) -> keep identical data-block", id->name, id->session_uid); diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index ac808df8031..de2530609cb 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -491,7 +491,7 @@ int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data) ID *id_cow = depsgraph->get_cow_id(id_orig); BLI_assert(id_cow != nullptr); DEG_COW_PRINT( - " Remapping datablock for %s: id_orig=%p id_cow=%p\n", id_orig->name, id_orig, id_cow); + " Remapping data-block for %s: id_orig=%p id_cow=%p\n", id_orig->name, id_orig, id_cow); *id_p = id_cow; } return IDWALK_RET_NOP; diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 0a019127d78..3ceaf7c4817 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -3147,7 +3147,7 @@ void OBJECT_OT_drop_geometry_nodes(wmOperatorType *ot) RNA_def_boolean(ot->srna, "show_datablock_in_modifier", true, - "Show the datablock selector in the modifier", + "Show the data-block selector in the modifier", ""); } diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index a77a661b102..6538ec5c527 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -391,7 +391,7 @@ void NODE_OT_add_group(wmOperatorType *ot) WM_operator_properties_id_lookup(ot, true); PropertyRNA *prop = RNA_def_boolean( - ot->srna, "show_datablock_in_node", true, "Show the datablock selector in the node", ""); + ot->srna, "show_datablock_in_node", true, "Show the data-block selector in the node", ""); RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN); } diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index 72d14dc0d82..c98ca39f797 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -316,7 +316,7 @@ static int rna_ID_name_editable(const PointerRNA *ptr, const char **r_info) } else if (!BKE_id_is_in_global_main(id)) { if (r_info) { - *r_info = N_("Datablocks not in global Main data-base cannot be renamed"); + *r_info = N_("Data-blocks not in global Main data-base cannot be renamed"); } return 0; } @@ -2373,7 +2373,7 @@ static void rna_def_ID(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Editable", - "This data-block is editable in the user interface. Linked datablocks " + "This data-block is editable in the user interface. Linked data-blocks " "are not editable, except if they were loaded as editable assets."); prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE); @@ -2550,7 +2550,7 @@ static void rna_def_ID(BlenderRNA *brna) func = RNA_def_function(srna, "make_local", "rna_ID_make_local"); RNA_def_function_ui_description( func, - "Make this datablock local, return local one " + "Make this data-block local, return local one " "(may be a copy of the original, in case it is also indirectly used)"); RNA_def_function_flag(func, FUNC_USE_MAIN); parm = RNA_def_boolean(func, "clear_proxy", true, "", "Deprecated, has no effect"); @@ -2668,8 +2668,8 @@ static void rna_def_library(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Editable", - "Datablocks in this library are editable despite being linked. Used by " - "brush assets and their dependencies."); + "Data-blocks in this library are editable despite being linked. " + "Used by brush assets and their dependencies."); func = RNA_def_function(srna, "reload", "rna_Library_reload"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_CONTEXT); diff --git a/source/blender/makesrna/intern/rna_depsgraph.cc b/source/blender/makesrna/intern/rna_depsgraph.cc index 29b8f8e0e93..e2237f9e653 100644 --- a/source/blender/makesrna/intern/rna_depsgraph.cc +++ b/source/blender/makesrna/intern/rna_depsgraph.cc @@ -780,7 +780,7 @@ static void rna_def_depsgraph(BlenderRNA *brna) "updated", false, "Updated", - "True if any datablock with this type was added, updated or removed"); + "True if any data-block with this type was added, updated or removed"); RNA_def_function_return(func, parm); prop = RNA_def_property(srna, "scene_eval", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index 1cea5eed10e..34b621b20c8 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -906,7 +906,7 @@ void RNA_def_main_cameras(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this camera"); + "Decrement user counter of all data-blocks used by this camera"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this camera"); @@ -983,7 +983,7 @@ void RNA_def_main_objects(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this object"); + "Decrement user counter of all data-blocks used by this object"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this object"); @@ -1033,7 +1033,7 @@ void RNA_def_main_materials(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this material"); + "Decrement user counter of all data-blocks used by this material"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this material"); @@ -1076,7 +1076,7 @@ void RNA_def_main_node_groups(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this node tree"); + "Decrement user counter of all data-blocks used by this node tree"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this node tree"); @@ -1147,7 +1147,7 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this mesh data"); + "Decrement user counter of all data-blocks used by this mesh data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this mesh data"); @@ -1194,7 +1194,7 @@ void RNA_def_main_lights(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this light data"); + "Decrement user counter of all data-blocks used by this light data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this light data"); @@ -1230,7 +1230,7 @@ void RNA_def_main_libraries(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this library"); + "Decrement user counter of all data-blocks used by this library"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this library"); } @@ -1319,8 +1319,11 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0)); RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this image before deleting it"); - RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this image"); + RNA_def_boolean(func, + "do_id_user", + true, + "", + "Decrement user counter of all data-blocks used by this image"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this image"); @@ -1364,7 +1367,7 @@ void RNA_def_main_lattices(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this lattice data"); + "Decrement user counter of all data-blocks used by this lattice data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this lattice data"); @@ -1410,7 +1413,7 @@ void RNA_def_main_curves(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this curve data"); + "Decrement user counter of all data-blocks used by this curve data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this curve data"); @@ -1453,7 +1456,7 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this metaball data"); + "Decrement user counter of all data-blocks used by this metaball data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this metaball data"); @@ -1496,7 +1499,7 @@ void RNA_def_main_fonts(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this font before deleting it"); RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this font"); + func, "do_id_user", true, "", "Decrement user counter of all data-blocks used by this font"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this font"); @@ -1538,7 +1541,7 @@ void RNA_def_main_textures(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this texture"); + "Decrement user counter of all data-blocks used by this texture"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this texture"); @@ -1579,8 +1582,11 @@ void RNA_def_main_brushes(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0)); RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this brush before deleting it"); - RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this brush"); + RNA_def_boolean(func, + "do_id_user", + true, + "", + "Decrement user counter of all data-blocks used by this brush"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this brush"); @@ -1621,8 +1627,11 @@ void RNA_def_main_worlds(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0)); RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this world before deleting it"); - RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this world"); + RNA_def_boolean(func, + "do_id_user", + true, + "", + "Decrement user counter of all data-blocks used by this world"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this world"); @@ -1662,7 +1671,7 @@ void RNA_def_main_collections(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this collection"); + "Decrement user counter of all data-blocks used by this collection"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this collection"); @@ -1706,7 +1715,7 @@ void RNA_def_main_speakers(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this speaker data"); + "Decrement user counter of all data-blocks used by this speaker data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this speaker data"); @@ -1743,7 +1752,7 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this text before deleting it"); RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this text"); + func, "do_id_user", true, "", "Decrement user counter of all data-blocks used by this text"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this text"); @@ -1799,8 +1808,11 @@ void RNA_def_main_sounds(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0)); RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this sound before deleting it"); - RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this sound"); + RNA_def_boolean(func, + "do_id_user", + true, + "", + "Decrement user counter of all data-blocks used by this sound"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this sound"); @@ -1844,7 +1856,7 @@ void RNA_def_main_armatures(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this armature data"); + "Decrement user counter of all data-blocks used by this armature data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this armature data"); @@ -1883,7 +1895,7 @@ void RNA_def_main_actions(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this action"); + "Decrement user counter of all data-blocks used by this action"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this action"); @@ -1929,7 +1941,7 @@ void RNA_def_main_particles(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this particle settings"); + "Decrement user counter of all data-blocks used by this particle settings"); RNA_def_boolean(func, "do_ui_user", true, @@ -1972,7 +1984,7 @@ void RNA_def_main_palettes(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this palette"); + "Decrement user counter of all data-blocks used by this palette"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this palette"); @@ -2026,7 +2038,7 @@ void RNA_def_main_annotations(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); func = RNA_def_function(srna, "new", "rna_Main_annotations_new"); - RNA_def_function_ui_description(func, "Add a new annotation datablock to the main database"); + RNA_def_function_ui_description(func, "Add a new annotation data-block to the main database"); parm = RNA_def_string(func, "name", "Annotation", 0, "", "New name for the data-block"); RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); /* return type */ @@ -2045,7 +2057,7 @@ void RNA_def_main_annotations(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this annotation"); + "Decrement user counter of all data-blocks used by this annotation"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this annotation"); } @@ -2066,7 +2078,7 @@ void RNA_def_main_grease_pencil(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); func = RNA_def_function(srna, "new", "rna_Main_grease_pencils_new"); - RNA_def_function_ui_description(func, "Add a new Grease Pencil datablock to the main database"); + RNA_def_function_ui_description(func, "Add a new Grease Pencil data-block to the main database"); parm = RNA_def_string(func, "name", "GreasePencil", 0, "", "New name for the data-block"); RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); /* return type */ @@ -2087,7 +2099,7 @@ void RNA_def_main_grease_pencil(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this Grease Pencil"); + "Decrement user counter of all data-blocks used by this Grease Pencil"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this Grease Pencil"); } @@ -2119,7 +2131,7 @@ void RNA_def_main_movieclips(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this movie clip"); + "Decrement user counter of all data-blocks used by this movie clip"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this movie clip"); @@ -2179,7 +2191,7 @@ void RNA_def_main_masks(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_boolean( func, "do_unlink", true, "", "Unlink all usages of this mask before deleting it"); RNA_def_boolean( - func, "do_id_user", true, "", "Decrement user counter of all datablocks used by this mask"); + func, "do_id_user", true, "", "Decrement user counter of all data-blocks used by this mask"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this mask"); } @@ -2219,7 +2231,7 @@ void RNA_def_main_linestyles(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this line style"); + "Decrement user counter of all data-blocks used by this line style"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this line style"); } @@ -2278,7 +2290,7 @@ void RNA_def_main_lightprobes(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this light probe"); + "Decrement user counter of all data-blocks used by this light probe"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this light probe"); @@ -2322,7 +2334,7 @@ void RNA_def_main_hair_curves(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this curves data"); + "Decrement user counter of all data-blocks used by this curves data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this curves data"); @@ -2366,7 +2378,7 @@ void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this point cloud data"); + "Decrement user counter of all data-blocks used by this point cloud data"); RNA_def_boolean(func, "do_ui_user", true, @@ -2413,7 +2425,7 @@ void RNA_def_main_volumes(BlenderRNA *brna, PropertyRNA *cprop) "do_id_user", true, "", - "Decrement user counter of all datablocks used by this volume data"); + "Decrement user counter of all data-blocks used by this volume data"); RNA_def_boolean( func, "do_ui_user", true, "", "Make sure interface does not reference this volume data"); diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 60cb92d7f5a..4baadc1c4a8 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -6276,7 +6276,7 @@ static void rna_def_space_sequencer_timeline_overlay(BlenderRNA *brna) RNA_def_property_boolean_sdna( prop, nullptr, "timeline_overlay.flag", SEQ_TIMELINE_SHOW_STRIP_SOURCE); RNA_def_property_ui_text( - prop, "Show Source", "Display path to source file, or name of source datablock"); + prop, "Show Source", "Display path to source file, or name of source data-block"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, nullptr); prop = RNA_def_property(srna, "show_strip_duration", PROP_BOOLEAN, PROP_NONE); @@ -6620,7 +6620,7 @@ static void rna_def_space_text(BlenderRNA *brna) RNA_def_boolean(func, "is_syntax_highlight_supported", false, "", "")); RNA_def_function_ui_description(func, "Returns True if the editor supports syntax highlighting " - "for the current text datablock"); + "for the current text data-block"); prop = RNA_def_property(srna, "show_syntax_highlight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "showsyntax", 0); diff --git a/source/blender/makesrna/intern/rna_text_api.cc b/source/blender/makesrna/intern/rna_text_api.cc index beedf19b9af..73887d4380a 100644 --- a/source/blender/makesrna/intern/rna_text_api.cc +++ b/source/blender/makesrna/intern/rna_text_api.cc @@ -86,7 +86,7 @@ void RNA_api_text(StructRNA *srna) RNA_def_boolean(func, "is_syntax_highlight_supported", false, "", "")); RNA_def_function_ui_description(func, "Returns True if the editor supports syntax highlighting " - "for the current text datablock"); + "for the current text data-block"); func = RNA_def_function(srna, "select_set", "rna_Text_select_set"); RNA_def_function_ui_description(func, "Set selection range by line and character index"); diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index b70143d89bb..edacfa13027 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -196,7 +196,7 @@ static void register_node_type_cmp_mask() cmp_node_type_base(&ntype, "CompositorNodeMask", CMP_NODE_MASK); ntype.ui_name = "Mask"; - ntype.ui_description = "Input mask from a mask datablock, created in the image editor"; + ntype.ui_description = "Input mask from a mask data-block, created in the image editor"; ntype.enum_name_legacy = "MASK"; ntype.nclass = NODE_CLASS_INPUT; ntype.declare = file_ns::cmp_node_mask_declare; diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index 376042d0706..1c9cafef95c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -270,7 +270,7 @@ static void register_node_type_cmp_movieclip() cmp_node_type_base(&ntype, "CompositorNodeMovieClip", CMP_NODE_MOVIECLIP); ntype.ui_name = "Movie Clip"; ntype.ui_description = - "Input image or movie from a movie clip datablock, typically used for motion tracking"; + "Input image or movie from a movie clip data-block, typically used for motion tracking"; ntype.enum_name_legacy = "MOVIECLIP"; ntype.nclass = NODE_CLASS_INPUT; ntype.declare = file_ns::cmp_node_movieclip_declare; diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index b17ad9c5868..c1f0438a1b4 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -1195,7 +1195,7 @@ PyDoc_STRVAR( bpy_bmesh_to_mesh_doc, ".. method:: to_mesh(mesh)\n" "\n" - " Writes this BMesh data into an existing Mesh datablock.\n" + " Writes this BMesh data into an existing Mesh data-block.\n" "\n" " :arg mesh: The mesh data to write into.\n" " :type mesh: :class:`Mesh`\n"); @@ -1356,7 +1356,7 @@ PyDoc_STRVAR( ".. method:: from_mesh(mesh, face_normals=True, vertex_normals=True, use_shape_key=False, " "shape_key_index=0)\n" "\n" - " Initialize this bmesh from existing mesh datablock.\n" + " Initialize this bmesh from existing mesh data-block.\n" "\n" " :arg mesh: The mesh data to load.\n" " :type mesh: :class:`Mesh`\n" diff --git a/source/blender/python/gpu/gpu_py_texture.cc b/source/blender/python/gpu/gpu_py_texture.cc index f60d351e614..2bd64910cae 100644 --- a/source/blender/python/gpu/gpu_py_texture.cc +++ b/source/blender/python/gpu/gpu_py_texture.cc @@ -686,13 +686,13 @@ PyDoc_STRVAR( pygpu_texture_from_image_doc, ".. function:: from_image(image)\n" "\n" - " Get GPUTexture corresponding to an Image datablock. The GPUTexture " + " Get GPUTexture corresponding to an Image data-block. The GPUTexture " "memory is " "shared with Blender.\n" " Note: Colors read from the texture will be in scene linear color space and have " "premultiplied or straight alpha matching the image alpha mode.\n" "\n" - " :arg image: The Image datablock.\n" + " :arg image: The Image data-block.\n" " :type image: :class:`bpy.types.Image`\n" " :return: The GPUTexture used by the image.\n" " :rtype: :class:`gpu.types.GPUTexture`\n"); diff --git a/source/blender/python/intern/bpy_app_handlers.cc b/source/blender/python/intern/bpy_app_handlers.cc index 50a74e40d97..6c28f81a5a4 100644 --- a/source/blender/python/intern/bpy_app_handlers.cc +++ b/source/blender/python/intern/bpy_app_handlers.cc @@ -42,19 +42,19 @@ static PyTypeObject BlenderAppCbType; "the render stats (render/saving time plus in background mode frame/used [peak] memory)." #define DEPSGRAPH_UPDATE_ARG \ "Accepts two arguments: " \ - "The scene datablock and the dependency graph being updated" + "The scene data-block and the dependency graph being updated" #define RENDER_ARG \ "Accepts one argument: " \ - "the scene datablock being rendered" + "the scene data-block being rendered" #define OBJECT_BAKE_ARG \ "Accepts one argument: " \ - "the object datablock being baked" + "the object data-block being baked" #define COMPOSITE_ARG \ "Accepts one argument: " \ - "the scene datablock" + "the scene data-block" #define ANNOTATION_ARG \ "Accepts two arguments: " \ - "the annotation datablock and dependency graph" + "the annotation data-block and dependency graph" #define BLENDIMPORT_ARG \ "Accepts one argument: " \ "a BlendImportContext" diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index 3fea05dce97..6181943de9e 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -443,7 +443,7 @@ static bool rna_id_write_error(PointerRNA *ptr, PyObject *key) BLI_assert(idtype != nullptr); PyErr_Format(PyExc_AttributeError, "Writing to ID classes in this context is not allowed: " - "%.200s, %.200s datablock, error setting %.200s.%.200s", + "%.200s, %.200s data-block, error setting %.200s.%.200s", id->name + 2, idtype, RNA_struct_identifier(ptr->type), @@ -2865,7 +2865,7 @@ static PyObject *pyrna_prop_collection_subscript(BPy_PropertyRNA *self, PyObject return pyrna_prop_collection_subscript_slice(self, start, stop); } if (PyTuple_Check(key)) { - /* Special case, for ID datablocks we. */ + /* Special case, for ID data-blocks we. */ return pyrna_prop_collection_subscript_str_lib_pair( self, key, "bpy_prop_collection[id, lib]", true); } @@ -3646,7 +3646,7 @@ static int pyrna_struct_ass_subscript(BPy_StructRNA *self, PyObject *key, PyObje { PyErr_SetString( PyExc_TypeError, - "bpy_struct[key] = val: datablock id properties not supported for this type"); + "bpy_struct[key] = val: data-block id properties not supported for this type"); return -1; } } @@ -5156,8 +5156,8 @@ static PyObject *pyrna_prop_collection_idprop_move(BPy_PropertyRNA *self, PyObje PyDoc_STRVAR( /* Wrap. */ pyrna_struct_get_id_data_doc, - "The :class:`bpy.types.ID` object this datablock is from or None, (not available for " - "all data types)\n" + "The :class:`bpy.types.ID` object this data-block is from or None, " + "(not available for all data types)\n" "\n" ":type: :class:`bpy.types.ID`, (readonly)\n"); static PyObject *pyrna_struct_get_id_data(BPy_DummyPointerRNA *self, void * /*closure*/) diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index 108cf1d05d1..6b3db82be2d 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -963,13 +963,13 @@ static wmOperatorStatus wm_lib_relocate_exec_do(bContext *C, wmOperator *op, boo continue; } - CLOG_DEBUG(&LOG, "\tCandidate new lib to reload datablocks from: %s", filepath); + CLOG_DEBUG(&LOG, "\tCandidate new lib to reload data-blocks from: %s", filepath); BKE_blendfile_link_append_context_library_add(lapp_context, filepath, nullptr); } RNA_END; } else { - CLOG_DEBUG(&LOG, "\tCandidate new lib to reload datablocks from: %s", filepath); + CLOG_DEBUG(&LOG, "\tCandidate new lib to reload data-blocks from: %s", filepath); BKE_blendfile_link_append_context_library_add(lapp_context, filepath, nullptr); } }