diff options
Diffstat (limited to 'source/blender/depsgraph/intern/node')
4 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/node/deg_node_component.cc b/source/blender/depsgraph/intern/node/deg_node_component.cc index dc7ca371de3..ceec62e278b 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.cc +++ b/source/blender/depsgraph/intern/node/deg_node_component.cc @@ -335,7 +335,7 @@ void BoneComponentNode::init(const ID *id, const char *subdata) /* name of component comes is bone name */ /* TODO(sergey): This sets name to an empty string because subdata is * empty. Is it a bug? */ - //this->name = subdata; + // this->name = subdata; /* bone-specific node data */ Object *object = (Object *)id; diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 77e8f4f37e0..c5b9c56bcf0 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -111,6 +111,7 @@ void IDNode::init(const ID *id, const char *UNUSED(subdata)) linked_state = DEG_ID_LINKED_INDIRECTLY; is_directly_visible = true; is_collection_fully_expanded = false; + has_base = false; visible_components_mask = 0; previously_visible_components_mask = 0; diff --git a/source/blender/depsgraph/intern/node/deg_node_id.h b/source/blender/depsgraph/intern/node/deg_node_id.h index 34d78e29060..b4351ec988c 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.h +++ b/source/blender/depsgraph/intern/node/deg_node_id.h @@ -96,6 +96,9 @@ struct IDNode : public Node { * recursed into. */ bool is_collection_fully_expanded; + /* Is used to figure out whether object came to the dependency graph via a base. */ + bool has_base; + IDComponentsMask visible_components_mask; IDComponentsMask previously_visible_components_mask; diff --git a/source/blender/depsgraph/intern/node/deg_node_operation.cc b/source/blender/depsgraph/intern/node/deg_node_operation.cc index 54a5ecef35c..154563303ad 100644 --- a/source/blender/depsgraph/intern/node/deg_node_operation.cc +++ b/source/blender/depsgraph/intern/node/deg_node_operation.cc @@ -208,14 +208,11 @@ string OperationNode::identifier() const * used for logging and debug prints. */ string OperationNode::full_identifier() const { - string owner_str = ""; - if (owner->type == NodeType::BONE) { - owner_str = string(owner->owner->name) + "." + owner->name; + string owner_str = owner->owner->name; + if (owner->type == NodeType::BONE || !owner->name.empty()) { + owner_str += "/" + owner->name; } - else { - owner_str = owner->owner->name; - } - return owner_str + "." + identifier(); + return owner_str + "/" + identifier(); } void OperationNode::tag_update(Depsgraph *graph, eUpdateSource source) |