diff options
Diffstat (limited to 'source/blender/depsgraph')
7 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index cc6c5e7282a..bd59ebcd869 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -81,7 +81,7 @@ void DEG_get_customdata_mask_for_object(const struct Depsgraph *graph, /* Get scene at its evaluated state. * * Technically, this is a copied-on-written and fully evaluated version of the input scene. - * This function will check that the datablock has been expanded (and copied) from the original + * This function will check that the data-block has been expanded (and copied) from the original * one. Assert will happen if it's not. */ struct Scene *DEG_get_evaluated_scene(const struct Depsgraph *graph); @@ -119,13 +119,13 @@ struct ID *DEG_get_original_id(struct ID *id); /* Check whether given ID is an original, * * Original IDs are considered all the IDs which are not covered by copy-on-write system and are - * not out-of-main localized datablocks. */ + * not out-of-main localized data-blocks. */ bool DEG_is_original_id(struct ID *id); bool DEG_is_original_object(struct Object *object); /* Opposite of the above. * - * If the datablock is not original it must be evaluated, and vice versa. */ + * If the data-block is not original it must be evaluated, and vice versa. */ bool DEG_is_evaluated_id(struct ID *id); bool DEG_is_evaluated_object(struct Object *object); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 9b1d528ab37..524a6c16a39 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1193,7 +1193,7 @@ void DepsgraphRelationBuilder::build_animdata_curves_targets(ID *id, } graph_->add_new_relation( operation_from, operation_to, "Animation -> Prop", RELATION_CHECK_BEFORE_ADD); - /* It is possible that animation is writing to a nested ID datablock, + /* It is possible that animation is writing to a nested ID data-block, * need to make sure animation is evaluated after target ID is copied. */ const IDNode *id_node_from = operation_from->owner->owner; const IDNode *id_node_to = operation_to->owner->owner; @@ -1397,8 +1397,8 @@ void DepsgraphRelationBuilder::build_driver_data(ID *id, FCurve *fcu) /* If it's not a Bone, handle the generic single dependency case. */ add_relation(driver_key, property_entry_key, "Driver -> Driven Property"); /* Similar to the case with f-curves, driver might drive a nested - * datablock, which means driver execution should wait for that - * datablock to be copied. */ + * data-block, which means driver execution should wait for that + * data-block to be copied. */ { PointerRNA id_ptr; PointerRNA ptr; @@ -1838,11 +1838,11 @@ void DepsgraphRelationBuilder::build_shapekeys(Key *key) * Therefore, each user of a piece of shared geometry data ends up evaluating * its own version of the stuff, complete with whatever modifiers it may use. * - * - The datablocks for the geometry data - "obdata" (e.g. ID_ME, ID_CU, ID_LT.) + * - The data-blocks for the geometry data - "obdata" (e.g. ID_ME, ID_CU, ID_LT.) * are used for * 1) calculating the bounding boxes of the geometry data, * 2) aggregating inward links from other objects (e.g. for text on curve) - * and also for the links coming from the shapekey datablocks + * and also for the links coming from the shapekey data-blocks * - Animation/Drivers affecting the parameters of the geometry are made to * trigger updates on the obdata geometry component, which then trigger * downstream re-evaluation of the individual instances of this geometry. */ @@ -1966,7 +1966,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object) &object->id, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL); add_relation(time_key, obdata_ubereval_key, "Legacy particle time"); } - /* Object data datablock. */ + /* Object data data-block. */ build_object_data_geometry_datablock((ID *)object->data); Key *key = BKE_key_from_object(object); if (key != NULL) { @@ -2502,7 +2502,7 @@ void DepsgraphRelationBuilder::build_copy_on_write_relations(IDNode *id_node) } GHASH_FOREACH_END(); /* NOTE: We currently ignore implicit relations to an external - * datablocks for copy-on-write operations. This means, for example, + * data-blocks for copy-on-write operations. This means, for example, * copy-on-write component of Object will not wait for copy-on-write * component of it's Mesh. This is because pointers are all known * already so remapping will happen all correct. And then If some object diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 865da20e6fd..48dbd4b0945 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -153,7 +153,7 @@ Scene *DEG_get_evaluated_scene(const Depsgraph *graph) { const DEG::Depsgraph *deg_graph = reinterpret_cast<const DEG::Depsgraph *>(graph); Scene *scene_cow = deg_graph->scene_cow; - /* TODO(sergey): Shall we expand datablock here? Or is it OK to assume + /* TODO(sergey): Shall we expand data-block here? Or is it OK to assume * that calleer is OK with just a pointer in case scene is not updated * yet? */ BLI_assert(scene_cow != NULL && DEG::deg_copy_on_write_is_expanded(&scene_cow->id)); @@ -201,7 +201,7 @@ ID *DEG_get_evaluated_id(const Depsgraph *depsgraph, ID *id) } /* TODO(sergey): This is a duplicate of Depsgraph::get_cow_id(), * but here we never do assert, since we don't know nature of the - * incoming ID datablock. */ + * incoming ID data-block. */ const DEG::Depsgraph *deg_graph = (const DEG::Depsgraph *)depsgraph; const DEG::IDNode *id_node = deg_graph->find_id_node(id); if (id_node == NULL) { @@ -292,14 +292,14 @@ bool DEG_is_original_id(ID *id) * What we want here is to be able to tell whether given ID is a result of dependency graph * evaluation or not. * - * All the datablocks which are created by copy-on-write mechanism will have will be tagged with - * LIB_TAG_COPIED_ON_WRITE tag. Those datablocks can not be original. + * All the data-blocks which are created by copy-on-write mechanism will have will be tagged with + * LIB_TAG_COPIED_ON_WRITE tag. Those data-blocks can not be original. * - * Modifier stack evaluation might create special datablocks which have all the modifiers - * applied, and those will be tagged with LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT. Such datablocks + * Modifier stack evaluation might create special data-blocks which have all the modifiers + * applied, and those will be tagged with LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT. Such data-blocks * can not be original as well. * - * Localization is usually happening from evaluated datablock, or will have some special pointer + * Localization is usually happening from evaluated data-block, or will have some special pointer * magic which will make them to act as evaluated. * * NOTE: We conder ID evaluated if ANY of those flags is set. We do NOT require ALL of them. */ 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) { diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.h b/source/blender/depsgraph/intern/node/deg_node_operation.h index 8fc565cfa77..b0776d186bb 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.h +++ b/source/blender/depsgraph/intern/node/deg_node_operation.h @@ -100,7 +100,7 @@ enum class OperationCode { /* Evaluation of geometry is completely done.. */ GEOMETRY_EVAL_DONE, /* Evaluation of a shape key. - * NOTE: Currently only for object data datablocks. */ + * NOTE: Currently only for object data data-blocks. */ GEOMETRY_SHAPEKEY, /* Object data. --------------------------------------------------------- */ @@ -188,7 +188,7 @@ enum class OperationCode { /* Synchronization. ----------------------------------------------------- */ SYNCHRONIZE_TO_ORIGINAL, - /* Generic datablock ---------------------------------------------------- */ + /* Generic data-block --------------------------------------------------- */ GENERIC_DATABLOCK_UPDATE, /* Sequencer. ----------------------------------------------------------- */ |