diff options
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 4 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_tag.cc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 34465c12914..ed002321729 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -86,7 +86,7 @@ void verify_id_properties_freed(DEGObjectIterData *data) const Object *dupli_object = data->dupli_object_current->ob; Object *temp_dupli_object = &data->temp_dupli_object; if (temp_dupli_object->id.properties == nullptr) { - // No ID properties in temp datablock -- no leak is possible. + // No ID properties in temp data-block -- no leak is possible. return; } if (temp_dupli_object->id.properties == dupli_object->id.properties) { @@ -435,7 +435,7 @@ static void DEG_iterator_ids_step(BLI_Iterator *iter, deg::IDNode *id_node, bool if (only_updated && !(id_cow->recalc & ID_RECALC_ALL)) { bNodeTree *ntree = ntreeFromID(id_cow); - /* Nodetree is considered part of the datablock. */ + /* Node-tree is considered part of the data-block. */ if (!(ntree && (ntree->id.recalc & ID_RECALC_ALL))) { iter->skip = true; return; diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index c60ec4351bc..2051ee3657a 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -253,7 +253,7 @@ void depsgraph_update_editors_tag(Main *bmain, Depsgraph *graph, ID *id) { /* NOTE: We handle this immediately, without delaying anything, to be * sure we don't cause threading issues with OpenGL. */ - /* TODO(sergey): Make sure this works for CoW-ed datablocks as well. */ + /* TODO(sergey): Make sure this works for CoW-ed data-blocks as well. */ DEGEditorUpdateContext update_ctx = {nullptr}; update_ctx.bmain = bmain; update_ctx.depsgraph = (::Depsgraph *)graph; @@ -306,7 +306,7 @@ void depsgraph_tag_component(Depsgraph *graph, /* This is a tag compatibility with legacy code. * * Mainly, old code was tagging object with ID_RECALC_GEOMETRY tag to inform - * that object's data datablock changed. Now API expects that ID is given + * that object's data data-block changed. Now API expects that ID is given * explicitly, but not all areas are aware of this yet. */ void deg_graph_id_tag_legacy_compat( Main *bmain, Depsgraph *depsgraph, ID *id, IDRecalcFlag tag, eUpdateSource update_source) @@ -667,7 +667,7 @@ void graph_id_tag_update( IDRecalcFlag tag = (IDRecalcFlag)(1 << bitscan_forward_clear_i(¤t_flag)); graph_id_tag_update_single_flag(bmain, graph, id, id_node, tag, update_source); } - /* Special case for nested node tree datablocks. */ + /* Special case for nested node tree data-blocks. */ id_tag_update_ntree_special(bmain, graph, id, flag, update_source); /* Direct update tags means that something outside of simulated/cached * physics did change and that cache is to be invalidated. @@ -777,12 +777,12 @@ void DEG_graph_time_tag_update(struct Depsgraph *depsgraph) deg_graph->tag_time_source(); } -/* Mark a particular datablock type as having changing. */ +/* Mark a particular data-block type as having changing. */ void DEG_graph_id_type_tag(Depsgraph *depsgraph, short id_type) { if (id_type == ID_NT) { - /* Stupid workaround so parent datablocks of nested nodetree get looped - * over when we loop over tagged datablock types. */ + /* Stupid workaround so parent data-blocks of nested node-tree get looped + * over when we loop over tagged data-block types. */ DEG_graph_id_type_tag(depsgraph, ID_MA); DEG_graph_id_type_tag(depsgraph, ID_TE); DEG_graph_id_type_tag(depsgraph, ID_LA); |