blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 512994fbdb - Show all commits

2
source/blender/depsgraph/intern/node/deg_node_component.cc
View File

@ -167,7 +167,7 @@ OperationNode *ComponentNode::add_operation(const DepsEvalOperationCb &op,
op_node = (OperationNode *)factory->create_node(this->owner->id_orig, "", name);
/* register opnode in this component's operation set */
OperationIDKey key(opcode, name, name_tag);
OperationIDKey key(opcode, op_node->name.c_str(), name_tag);
operations_map->add(key, op_node);
/* Set back-link. */

2
source/blender/depsgraph/intern/node/deg_node_id.cc
View File

@ -155,7 +155,7 @@ ComponentNode *IDNode::add_component(NodeType type, const char *name)
comp_node = (ComponentNode *)factory->create_node(this->id_orig, "", name);
/* Register. */
ComponentIDKey key(type, name);
ComponentIDKey key(type, comp_node->name.c_str());
components.add_new(key, comp_node);
comp_node->owner = this;
}