diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-05-07 23:06:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-07 23:06:22 +0300 |
| commit | 04c04b6f4d31b92521d43020a5c8a9841397dc25 (patch) | |
| tree | 04a717335e154a462c6f147a2a9f7a87b45d8967 /source/blender/blenkernel | |
| parent | b5eeef834f5d59c081ff15a5b8a01d414c6d8e1d (diff) | |
| parent | 05fafb05b199729916f10504336747a504cf8563 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/volume.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 5cb4703bc46..aef274f7d91 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -505,7 +505,7 @@ static void studiolight_create_equirect_radiance_gputexture(StudioLight *sl) GPUTexture *tex = sl->equirect_radiance_gputexture; GPU_texture_bind(tex, 0); GPU_texture_filter_mode(tex, true); - GPU_texture_wrap_mode(tex, true); + GPU_texture_wrap_mode(tex, true, true); GPU_texture_unbind(tex); } sl->flag |= STUDIOLIGHT_EQUIRECT_RADIANCE_GPUTEXTURE; @@ -569,7 +569,7 @@ static void studiolight_create_equirect_irradiance_gputexture(StudioLight *sl) GPUTexture *tex = sl->equirect_irradiance_gputexture; GPU_texture_bind(tex, 0); GPU_texture_filter_mode(tex, true); - GPU_texture_wrap_mode(tex, true); + GPU_texture_wrap_mode(tex, true, true); GPU_texture_unbind(tex); } sl->flag |= STUDIOLIGHT_EQUIRECT_IRRADIANCE_GPUTEXTURE; 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; + } } } |