griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix incorrect update tag handling in inactive depsgraphs

Browse Source 
The dependency graph builder takes the original data-block's recalc
flags to tag IDs after the dependency graph has been built, while
the evaluation of the graph only re-sets tho recalc flag to 0 only
for active dependency graph. This could have caused an inconsistency
of the handled tags: for example, if a headless render modifies some
object's properties and then renders the scene multiple times without
re-creating dependency graph (using Eevee or having Persistent Data,
and rendering multiple view layers, for example).

This change makes it so the recalc flags from the original ID are
only considered by active dependency graph, of when an ID is first
evaluated within a non-active dependency graph. This is a bit of a
conservative change to avoid possible breakage. In theory it should
be possible to never consider original recalc flags for render, and,
eventually, also ignore it for the active graphs. This needs to be
with more care and, so follow safer approach for now.

In practice this change fixes an issue with missing particle hair
when rendering second view layer of rlayer_flags_01.blend with Eevee.

Pull Request: https://projects.blender.org/blender/blender/pulls/117854
This commit is contained in:
Sergey Sharybin
2024-02-05 16:59:14 +01:00
committed by Sergey Sharybin
parent 212d736842
commit 4f0ec384ce
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/depsgraph/intern/builder/deg_builder.cc
View File

@@ -195,7 +195,8 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph)
if (id_node->customdata_masks != id_node->previous_customdata_masks) {
flag |= ID_RECALC_GEOMETRY;
}
if (!deg_copy_on_write_is_expanded(id_node->id_cow)) {
const bool is_expanded = deg_copy_on_write_is_expanded(id_node->id_cow);
if (!is_expanded) {
flag |= ID_RECALC_COPY_ON_WRITE;
/* This means ID is being added to the dependency graph first
* time, which is similar to "ob-visible-change" */
@@ -216,8 +217,19 @@ void deg_graph_build_finalize(Main *bmain, Depsgraph *graph)
}
}
/* Restore recalc flags from original ID, which could possibly contain recalc flags set by
* an operator and then were carried on by the undo system. */
flag |= id_orig->recalc;
* an operator and then were carried on by the undo system.
*
* Only do it for active dependency graph, because otherwise modifications to the original
* objects might keep affecting the render pipeline. For example, when a Python script is
* executed in headless mode it will tag original objects for recalculation, and the flag
* will never be reset to 0 because there is no active dependency graph (since the
* DEG_ids_clear_recalc() only clears original ID recalc flags for the active depsgraph.
*
* A bit of a safety is to also consider the accumulated recalc flags from the original
* data-block for the first evaluation of the data-block within an inactive graph. */
if (graph->is_active || !is_expanded) {
flag |= id_orig->recalc;
}
if (flag != 0) {
graph_id_tag_update(bmain, graph, id_node->id_orig, flag, DEG_UPDATE_SOURCE_RELATIONS);
}