Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-04-06 16:02:30 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-04-06 16:02:30 +0300
commit9676a1f61ebeffb3013f8fa0a56ce6e8747fb3c5 (patch)
tree231616cb93eef86e643e1b4947b81320a9ae5405 /source/blender/depsgraph
parent19ff2479cf686f32c29120ea8be02eef5c2423a2 (diff)
Fix render crash in some .blend files after Persistent Data changes
Must always clear recalc flags, even if no editors use them, the depsgraph execution itself also depends on them.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_tag.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 504c3956d03..d658fcce08a 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -828,18 +828,17 @@ void DEG_editors_update(
Main *bmain, Depsgraph *depsgraph, Scene *scene, ViewLayer *view_layer, bool time)
{
deg::Depsgraph *graph = (deg::Depsgraph *)depsgraph;
- if (!graph->use_editors_update) {
- return;
- }
- bool updated = time || DEG_id_type_any_updated(depsgraph);
+ if (graph->use_editors_update) {
+ bool updated = time || DEG_id_type_any_updated(depsgraph);
- DEGEditorUpdateContext update_ctx = {nullptr};
- update_ctx.bmain = bmain;
- update_ctx.depsgraph = depsgraph;
- update_ctx.scene = scene;
- update_ctx.view_layer = view_layer;
- deg::deg_editors_scene_update(&update_ctx, updated);
+ DEGEditorUpdateContext update_ctx = {nullptr};
+ update_ctx.bmain = bmain;
+ update_ctx.depsgraph = depsgraph;
+ update_ctx.scene = scene;
+ update_ctx.view_layer = view_layer;
+ deg::deg_editors_scene_update(&update_ctx, updated);
+ }
DEG_ids_clear_recalc(depsgraph);
}