diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-18 17:28:33 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-07-18 17:37:32 +0400 |
commit | 9a45c9dadf435ac6c1329372dc08f21b1af242c6 (patch) | |
tree | 91bc74aa7ac5ca8bedfdc8f19016be2dcba6bf98 /intern | |
parent | b98448918160f05feb725c29a9c6b7c2cf4257f8 (diff) |
Fix T41109: Reloading image that has been modified outside Blender does not update image in Image Texture nodes
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 14 | ||||
-rw-r--r-- | intern/cycles/render/image.cpp | 26 | ||||
-rw-r--r-- | intern/cycles/render/image.h | 1 |
3 files changed, 41 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 51d8a4da744..193eb69173b 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -572,6 +572,13 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen image->animated = b_image_node.image_user().use_auto_refresh(); image->use_alpha = b_image.use_alpha(); + + /* TODO(sergey): Does not work properly when we change builtin type. */ + if (b_image.is_updated()) { + scene->image_manager->tag_reload_image(image->filename, + image->builtin_data, + (InterpolationType)b_image_node.interpolation()); + } } image->color_space = ImageTextureNode::color_space_enum[(int)b_image_node.color_space()]; image->projection = ImageTextureNode::projection_enum[(int)b_image_node.projection()]; @@ -602,6 +609,13 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen } env->use_alpha = b_image.use_alpha(); + + /* TODO(sergey): Does not work properly when we change builtin type. */ + if (b_image.is_updated()) { + scene->image_manager->tag_reload_image(env->filename, + env->builtin_data, + INTERPOLATION_LINEAR); + } } env->color_space = EnvironmentTextureNode::color_space_enum[(int)b_env_node.color_space()]; env->projection = EnvironmentTextureNode::projection_enum[(int)b_env_node.projection()]; diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 8369df5e137..f84396ab6a1 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -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 == "") diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 50ea346c034..535f0ff156d 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -59,6 +59,7 @@ public: bool& is_float, bool& is_linear, InterpolationType interpolation, bool use_alpha); void remove_image(int slot); void remove_image(const string& filename, void *builtin_data, InterpolationType interpolation); + void tag_reload_image(const string& filename, void *builtin_data, InterpolationType interpolation); bool is_float_image(const string& filename, void *builtin_data, bool& is_linear); void device_update(Device *device, DeviceScene *dscene, Progress& progress); |