diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-03-08 12:42:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-11 22:35:38 +0300 |
| commit | d8aa613d94caf6a3d82a8f4e9e90b9b8f5c61a7d (patch) | |
| tree | 7f85577ae4f37c9bdeba31fd65411b718b19b035 /intern/cycles/blender/blender_shader.cpp | |
| parent | ec3eeee46b4885b9167b0dc28d273993d77b8ce6 (diff) | |
Cleanup: add ImageHandle to centralize image ownership logic
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 25e1d60f84d..64367d5fcd0 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -686,14 +686,6 @@ static ShaderNode *add_node(Scene *scene, for (b_image.tiles.begin(b_iter); b_iter != b_image.tiles.end(); ++b_iter) { image->tiles.push_back(b_iter->number()); } - - /* TODO: restore */ - /* TODO(sergey): Does not work properly when we change builtin type. */ -#if 0 - if (b_image.is_updated()) { - scene->image_manager->tag_reload_image(image->image_key()); - } -#endif } node = image; } @@ -730,14 +722,6 @@ static ShaderNode *add_node(Scene *scene, env->animated = b_env_node.image_user().use_auto_refresh(); env->alpha_type = get_image_alpha_type(b_image); - - /* TODO: restore */ - /* TODO(sergey): Does not work properly when we change builtin type. */ -#if 0 - if (b_image.is_updated()) { - scene->image_manager->tag_reload_image(env->image_key()); - } -#endif } node = env; } @@ -885,14 +869,9 @@ static ShaderNode *add_node(Scene *scene, point_density->space = (NodeTexVoxelSpace)b_point_density_node.space(); point_density->interpolation = get_image_interpolation(b_point_density_node); point_density->builtin_data = b_point_density_node.ptr.data; - point_density->image_manager = scene->image_manager; - /* TODO(sergey): Use more proper update flag. */ - if (true) { - point_density->add_image(); - b_point_density_node.cache_point_density(b_depsgraph); - scene->image_manager->tag_reload_image(point_density->image_key()); - } + point_density->add_image(scene->image_manager); + b_point_density_node.cache_point_density(b_depsgraph); node = point_density; /* Transformation form world space to texture space. |