blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T49981: New Depsgraph - When camera is on inactive layer, it does not evaluate constraints

This commit is contained in:
Sergey Sharybin 2016-11-21 14:36:36 +01:00
parent af7343ae22
commit 25c534f20a
Notes: blender-bot 2023-02-14 07:25:48 +01:00 
Referenced by issue #49981, New Depsgraph - When camera is on inactive layer, it does not evaluate constraints
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -372,19 +372,26 @@ SubgraphDepsNode *DepsgraphNodeBuilder::build_subgraph(Group *group)
void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob)
{
if (ob->id.tag & LIB_TAG_DOIT) {
IDDepsNode *id_node = m_graph->find_id_node(&ob->id);
if (base != NULL) {
id_node->layers |= base->lay;
}
return;
}
ob->id.tag |= LIB_TAG_DOIT;
IDDepsNode *id_node = add_id_node(&ob->id);
const bool has_object = (ob->id.tag & LIB_TAG_DOIT);
IDDepsNode *id_node = (has_object)
? m_graph->find_id_node(&ob->id)
: add_id_node(&ob->id);
/* Update node layers.
* Do it for both new and existing ID nodes. This is so because several
* bases might be sharing same object.
*/
if (base != NULL) {
id_node->layers |= base->lay;
}
if (ob == scene->camera) {
/* Camera should always be updated, it used directly by viewport. */
id_node->layers |= (unsigned int)(-1);
}
/* Skip rest of components if the ID node was already there. */
if (has_object) {
return;
}
ob->id.tag |= LIB_TAG_DOIT;
ob->customdata_mask = 0;
/* Standard components. */