blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T65062: Compositor doesn't work when using different scene 

Need to preserve all view layers, even for indirectly linked scenes
since they might be used by render layer nodes.
This commit is contained in:
Sergey Sharybin 2019-05-24 11:24:16 +02:00
parent ba58b9d2af
commit fa299e669c
Notes: blender-bot 2023-05-22 12:40:41 +02:00 
Referenced by issue #65062, Compositor doesn't update anymore
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@ -341,23 +341,26 @@ void scene_remove_unused_view_layers(const Depsgraph *depsgraph,
Scene *scene_cow)
{
const ViewLayer *view_layer_input;
if (id_node->linked_state == DEG_ID_LINKED_INDIRECTLY) {
/* Indirectly linked scenes means it's not an input scene and not a set scene, and is pulled
* via some driver. Such scenes should not have view layers after copy. */
view_layer_input = NULL;
}
else if (depsgraph->is_render_pipeline_depsgraph) {
if (depsgraph->is_render_pipeline_depsgraph) {
/* If the dependency graph is used for post-processing (such as compositor) we do need to
* have access to its view layer names so can not remove any view layers.
* On a more positive side we can remove all the bases from all the view layers.
*
* NOTE: Need to clear pointers which might be pointing to original on freed (due to being
* unused) data. */
* unused) data.
*
* NOTE: Need to keep view layers for all scenes, even indirect ones. This is because of
* render layer node possibly pointing to another scene. */
LISTBASE_FOREACH (ViewLayer *, view_layer, &scene_cow->view_layers) {
view_layer->basact = NULL;
}
return;
}
else if (id_node->linked_state == DEG_ID_LINKED_INDIRECTLY) {
/* Indirectly linked scenes means it's not an input scene and not a set scene, and is pulled
* via some driver. Such scenes should not have view layers after copy. */
view_layer_input = NULL;
}
else {
view_layer_input = get_original_view_layer(depsgraph, id_node);
}