diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:12:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-06-12 18:35:15 +0300 |
| commit | 24d53f79b217ff7c62e4c32a49967447a0230fef (patch) | |
| tree | bdc956af250dd44e72520f14f1db0c82c258432d /intern/cycles/blender/blender_shader.cpp | |
| parent | 055001111e226e953b18c31deaacc2e1e7394f78 (diff) | |
Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future.
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 0b61cbb0f62..78a28b7feed 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -619,7 +619,7 @@ static ShaderNode *add_node(Scene *scene, /* 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->filename.string(), image->builtin_data, get_image_interpolation(b_image_node), get_image_extension(b_image_node)); @@ -665,7 +665,7 @@ static ShaderNode *add_node(Scene *scene, /* 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->filename.string(), env->builtin_data, get_image_interpolation(b_env_node), EXTENSION_REPEAT); |