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

Fix #140381: Crash after creating a node group and undo

Browse Source 
We need to ensure that the compositor preview depsgraph gets updated
properly after undo, now that the compositing node tree is not embedded
in the scene anymore.

A test case will be committed separately in #140595

Pull Request: https://projects.blender.org/blender/blender/pulls/140596
This commit is contained in:
Habib Gahbiche
2025-06-23 16:18:55 +02:00
parent 13068b2e9c
commit 5f00f9e08a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/undo/memfile_undo.cc
View File

@@ -26,6 +26,7 @@
#include "BKE_node.hh"
#include "BKE_preview_image.hh"
#include "BKE_scene.hh"
#include "BKE_scene_runtime.hh"
#include "BKE_undo_system.hh"
#include "../depsgraph/DEG_depsgraph.hh"
@@ -230,6 +231,17 @@ static void memfile_undosys_step_decode(
bmain, id, memfile_undosys_step_id_reused_cb, nullptr, IDWALK_READONLY);
}
if (GS(id->name) == ID_SCE) {
Scene *scene = reinterpret_cast<Scene *>(id);
if (scene->compositing_node_group) {
/* Ensure undo calls from the UI update the interactive compositor preview depsgraph, see
* #compo_initjob. */
blender::bke::CompositorRuntime &compositor_runtime = scene->runtime->compositor;
DEG_graph_free(compositor_runtime.preview_depsgraph);
compositor_runtime.preview_depsgraph = nullptr;
}
}
/* NOTE: Tagging `ID_RECALC_SYNC_TO_EVAL` here should not be needed in practice, since
* modified IDs should already have other depsgraph update tags anyway.
* However, for the sake of consistency, it's better to effectively use it,