blender
/
blender
134
399
Fork 582
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Depsgraph: Make it possible to use given pre-allocated ID as a copy

This commit is contained in:
Sergey Sharybin 2017-07-27 14:38:26 +02:00
parent 4c5537ed42
commit 41a3aafd48
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/depsgraph/intern/depsgraph.cc
View File

@ -286,6 +286,7 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag)
if (!id_node) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_ID_REF);
id_node = (IDDepsNode *)factory->create_node(id, "", id->name);
id_node->init_copy_on_write();
if (do_tag) {
id->tag |= LIB_TAG_DOIT;
}

11
source/blender/depsgraph/intern/nodes/deg_node.cc
View File

@ -173,14 +173,21 @@ void IDDepsNode::init(const ID *id, const char *UNUSED(subdata))
components = BLI_ghash_new(id_deps_node_hash_key,
id_deps_node_hash_key_cmp,
"Depsgraph id components hash");
}
void IDDepsNode::init_copy_on_write(ID *id_cow_hint)
{
#ifdef WITH_COPY_ON_WRITE
/* Create pointer as early as possible, so we can use it for function
* bindings. Rest of data we'll be copying to the new datablock when
* it is actually needed.
*/
if (deg_copy_on_write_is_needed(id_orig)) {
id_cow = (ID *)BKE_libblock_alloc_notest(GS(id->name));
if (id_cow_hint != NULL) {
BLI_assert(deg_copy_on_write_is_needed(id_orig));
id_cow = id_cow_hint;
}
else if (deg_copy_on_write_is_needed(id_orig)) {
id_cow = (ID *)BKE_libblock_alloc_notest(GS(id_orig->name));
DEG_COW_PRINT("Create shallow copy for %s: id_orig=%p id_cow=%p\n",
id_orig->name, id_orig, id_cow);
deg_tag_copy_on_write_id(id_cow, id_orig);

1
source/blender/depsgraph/intern/nodes/deg_node.h
View File

@ -138,6 +138,7 @@ struct IDDepsNode : public DepsNode {
};
void init(const ID *id, const char *subdata);
void init_copy_on_write(ID *id_cow_hint = NULL);
~IDDepsNode();
void destroy();