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
path: root/intern
diff options
context:
space:
mode:
authorLukas Stockner <lukas.stockner@freenet.de>2019-12-20 22:28:16 +0300
committerLukas Stockner <lukas.stockner@freenet.de>2019-12-20 22:28:16 +0300
commite9093a6e494b9588027d41c64bee6e8f4a5b2f52 (patch)
tree78b7835f1f7655d31688014455359b97c0014caf /intern
parent9a8f840c3174fa54cadfa1b475269149a3de2492 (diff)
Fix T72445: Cycles crash with Displacement maps in OSL
The UDIM commit accidentally removed a check that skipped Image updates if the image was managed by OSL.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/mesh.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 2bf1040455f..d9e6d998ebd 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -2130,7 +2130,9 @@ void MeshManager::device_update_displacement_images(Device *device,
ImageSlotTextureNode *image_node = static_cast<ImageSlotTextureNode *>(node);
foreach (int slot, image_node->slots) {
- bump_images.insert(slot);
+ if (slot != -1) {
+ bump_images.insert(slot);
+ }
}
}
}