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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-05-04 17:27:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-05-04 17:28:22 +0300
commita523dfd2fd8c19ca0fbf9891a3be0988945d585f (patch)
treed2031a29a8422202c2bc55b1965e9f99c8dd5a10 /intern/cycles/render/mesh.cpp
parentb180900e52a5e662faf354d6343cb2ad620d9866 (diff)
Fix T51412: Instant crash with texture plugged into the Displacement output
The issue was caused by unlimited textures commit, root of the issue is that displacement code updates some of the image slots directly, so it needs to ensure device vectors are all proper size.
Diffstat (limited to 'intern/cycles/render/mesh.cpp')
-rw-r--r--intern/cycles/render/mesh.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index a4dc06c4345..33d1936659b 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1944,6 +1944,7 @@ void MeshManager::device_update_displacement_images(Device *device,
}
}
}
+ image_manager->device_prepare_update(dscene);
foreach(int slot, bump_images) {
pool.push(function_bind(&ImageManager::device_update_slot,
image_manager,