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>2020-05-07 22:13:14 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-07 22:14:30 +0300
commit5473f0c49dc8e6bd4708ab48bb944b7265c88ace (patch)
tree7e50ae401d22cd51e5b495ee65f37b038ca97551
parentd8c3aad8004c57650bc095803c869c2aac6d541f (diff)
Fix T76468: volume sequence render not using correct frame in renders
Render datablocks were copying state from original datablocks, where the frame number and loaded volume grids were out of sync.
-rw-r--r--source/blender/blenkernel/intern/volume.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index 9d9e8423bcf..b0b7a60b556 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -815,7 +815,10 @@ void BKE_volume_eval_geometry(struct Depsgraph *depsgraph, Volume *volume)
/* Flush back to original. */
if (DEG_is_active(depsgraph)) {
Volume *volume_orig = (Volume *)DEG_get_original_id(&volume->id);
- volume_orig->runtime.frame = volume->runtime.frame;
+ if (volume_orig->runtime.frame != volume->runtime.frame) {
+ BKE_volume_unload(volume_orig);
+ volume_orig->runtime.frame = volume->runtime.frame;
+ }
}
}