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-06-02 19:44:43 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-06-02 20:44:12 +0300
commit52cc412e0f56f249d932e1025ea191939c1a6edb (patch)
tree2a1b261ca86d2868f4a9bf4ce7e5969c58f301db /intern/cycles/render/shader.cpp
parenteba3aa1837e40bf168528b1e3588540a7f241e1e (diff)
Revert "Fix T63588: Cycles unnecessarily updates background importance sampling map"
This reverts commit 33ce0cb5a1edea4b5aaa7d37f6ad74b3b35b95f8. Fix T77273: crash enabling portal lights. The optimization for background updates can be added back later for 2.90 and 2.83.1.
Diffstat (limited to 'intern/cycles/render/shader.cpp')
-rw-r--r--intern/cycles/render/shader.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 39ba45a751a..8403a636e1c 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -318,11 +318,9 @@ void Shader::tag_update(Scene *scene)
* has use_mis set to false. We are quite close to release now, so
* better to be safe.
*/
- if (this == scene->background->get_shader(scene)) {
- scene->light_manager->need_update_background = true;
- if (scene->light_manager->has_background_light(scene)) {
- scene->light_manager->need_update = true;
- }
+ if (this == scene->background->get_shader(scene) &&
+ scene->light_manager->has_background_light(scene)) {
+ scene->light_manager->need_update = true;
}
/* quick detection of which kind of shaders we have to avoid loading