diff options
Diffstat (limited to 'source/blender/depsgraph/intern/eval')
3 files changed, 16 insertions, 16 deletions
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 ef2862ab387..04d069af96d 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 @@ -22,7 +22,7 @@ */ /* Enable special; trickery to treat nested owned IDs (such as nodetree of - * material) to be handled in same way as "real" datablocks, even tho some + * material) to be handled in same way as "real" data-blocks, even tho some * internal BKE routines doesn't treat them like that. * * TODO(sergey): Re-evaluate that after new ID handling is in place. */ @@ -496,7 +496,7 @@ BLI_INLINE bool check_datablock_expanded(const ID *id_cow) return (id_cow->name[0] != '\0'); } -/* Those are datablocks which are not covered by dependency graph and hence +/* Those are data-blocks which are not covered by dependency graph and hence * does not need any remapping or anything. * * TODO(sergey): How to make it more robust for the future, so we don't have @@ -736,7 +736,7 @@ void update_animation_data_after_copy(const ID *id_orig, ID *id_cow) /* Do some special treatment of data transfer from original ID to it's * CoW complementary part. * - * Only use for the newly created CoW datablocks. */ + * Only use for the newly created CoW data-blocks. */ void update_id_after_copy(const Depsgraph *depsgraph, const IDNode *id_node, const ID *id_orig, @@ -784,7 +784,7 @@ void update_id_after_copy(const Depsgraph *depsgraph, BKE_animsys_update_driver_array(id_cow); } -/* This callback is used to validate that all nested ID datablocks are +/* This callback is used to validate that all nested ID data-blocks are * properly expanded. */ int foreach_libblock_validate_callback(void *user_data, ID * /*id_self*/, @@ -1483,10 +1483,10 @@ void discard_edit_mode_pointers(ID *id_cow) } // namespace -/* Free content of the CoW datablock +/* Free content of the CoW data-block * Notes: - * - Does not recurs into nested ID datablocks. - * - Does not free datablock itself. */ + * - Does not recurs into nested ID data-blocks. + * - Does not free data-block itself. */ void deg_free_copy_on_write_datablock(ID *id_cow) { if (!check_datablock_expanded(id_cow)) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h index b174941e3bb..2f83c2f54b9 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h @@ -47,8 +47,8 @@ struct Depsgraph; class DepsgraphNodeBuilder; struct IDNode; -/* Get fully expanded (ready for use) copy-on-write datablock for the given - * original datablock. +/* Get fully expanded (ready for use) copy-on-write data-block for the given + * original data-block. */ ID *deg_expand_copy_on_write_datablock(const struct Depsgraph *depsgraph, const IDNode *id_node, @@ -59,8 +59,8 @@ ID *deg_expand_copy_on_write_datablock(const struct Depsgraph *depsgraph, DepsgraphNodeBuilder *node_builder = NULL, bool create_placeholders = false); -/* Makes sure given CoW datablock is brought back to state of the original - * datablock. +/* Makes sure given CoW data-block is brought back to state of the original + * data-block. */ ID *deg_update_copy_on_write_datablock(const struct Depsgraph *depsgraph, const IDNode *id_node); ID *deg_update_copy_on_write_datablock(const struct Depsgraph *depsgraph, struct ID *id_orig); @@ -88,7 +88,7 @@ bool deg_copy_on_write_is_expanded(const struct ID *id_cow); /* Check whether copy-on-write datablock is needed for given ID. * - * There are some exceptions on datablocks which are covered by dependency graph + * There are some exceptions on data-blocks which are covered by dependency graph * but which we don't want to start duplicating. * * This includes images. diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc index 06e63b6868c..132b13d989b 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc @@ -56,7 +56,7 @@ extern "C" { #include "intern/eval/deg_eval_copy_on_write.h" -// Invalidate datablock data when update is flushed on it. +// Invalidate data-block data when update is flushed on it. // // The idea of this is to help catching cases when area is accessing data which // is not yet evaluated, which could happen due to missing relations. The issue @@ -254,11 +254,11 @@ void flush_editors_id_update(Depsgraph *graph, const DEGEditorUpdateContext *upd id_orig->name, (unsigned int)id_cow->recalc); - /* Inform editors. Only if the datablock is being evaluated a second + /* Inform editors. Only if the data-block is being evaluated a second * time, to distinguish between user edits and initial evaluation when - * the datablock becomes visible. + * the data-block becomes visible. * - * TODO: image datablocks do not use COW, so might not be detected + * TODO: image data-blocks do not use COW, so might not be detected * correctly. */ if (deg_copy_on_write_is_expanded(id_cow)) { if (graph->is_active && id_node->is_user_modified) { |