Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T41109: Reloading image that has been modified outside Blender does not update image in Image Texture nodes

Browse Source
This commit is contained in:
Sergey Sharybin
2014-07-18 19:28:33 +06:00
parent b984489181
commit 9a45c9dadf
5 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
intern/cycles/render/image.cpp
View File

@@ -313,6 +313,32 @@ void ImageManager::remove_image(const string& filename, void *builtin_data, Inte
}
}
/* TODO(sergey): Deduplicate with the iteration above, but make it pretty,
* without bunch of arguments passing around making code readability even
* more cluttered.
*/
void ImageManager::tag_reload_image(const string& filename, void *builtin_data, InterpolationType interpolation)
{
size_t slot;
for(slot = 0; slot < images.size(); slot++) {
if(images[slot] && image_equals(images[slot], filename, builtin_data, interpolation)) {
images[slot]->need_load = true;
break;
}
}
if(slot == images.size()) {
/* see if it's in a float texture slot */
for(slot = 0; slot < float_images.size(); slot++) {
if(float_images[slot] && image_equals(float_images[slot], filename, builtin_data, interpolation)) {
images[slot]->need_load = true;
break;
}
}
}
}
bool ImageManager::file_load_image(Image *img, device_vector<uchar4>& tex_img)
{
if(img->filename == "")