[Bf-blender-cvs] [e9093a6e494] master: Fix T72445: Cycles crash with Displacement maps in OSL

[Lukas Stockner]

Commit: e9093a6e494b9588027d41c64bee6e8f4a5b2f52
Author: Lukas Stockner
Date:   Fri Dec 20 20:28:16 2019 +0100
Branches: master
https://developer.blender.org/rBe9093a6e494b9588027d41c64bee6e8f4a5b2f52

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.

===================================================================

M	intern/cycles/render/mesh.cpp

===================================================================

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);
+            }
           }
         }
       }