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:
authorClément Foucault <foucault.clem@gmail.com>2020-08-06 14:39:09 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-06 14:39:09 +0300
commit690d61cf78cd8be3675023ef13b32a91683cfa15 (patch)
treed846d8a9cd9c67d6eaf15e10e943f3fcd4dea0f4 /source/blender
parentc4e606e38697beac863e1b8478d0758d4cc4b79a (diff)
parent574bd866c867ba0e63365c2fa59e4490295990bc (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/draw/engines/eevee/eevee_temporal_sampling.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index c1502afe519..e184a80d2f6 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -269,8 +269,9 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data
}
}
else {
- /* Fix Texture painting (see T79370). */
- if (DRW_state_is_navigating()) {
+ const bool all_shaders_compiled = stl->g_data->queued_shaders_count_prev == 0;
+ /* Fix Texture painting (see T79370) and shader compilation (see T78520). */
+ if (DRW_state_is_navigating() || !all_shaders_compiled) {
effects->taa_current_sample = 1;
}
else {