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 23:06:22 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-07 23:06:22 +0300
commit04c04b6f4d31b92521d43020a5c8a9841397dc25 (patch)
tree04a717335e154a462c6f147a2a9f7a87b45d8967 /source/blender/blenkernel/intern/volume.cc
parentb5eeef834f5d59c081ff15a5b8a01d414c6d8e1d (diff)
parent05fafb05b199729916f10504336747a504cf8563 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel/intern/volume.cc')
-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 1098ad6d95c..325a3c0fc11 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -855,7 +855,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;
+ }
}
}