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/app/cycles_xml.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/app/cycles_xml.cpp')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 48a2b12b23a..3aca46e2dc7 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -343,11 +343,11 @@ static void xml_read_shader_graph(XMLReadState& state, Shader *shader, pugi::xml if(node_name == "image_texture") { ImageTextureNode *img = (ImageTextureNode*) snode; - img->filename = path_join(state.base, img->filename); + img->filename = path_join(state.base, img->filename.string()); } else if(node_name == "environment_texture") { EnvironmentTextureNode *env = (EnvironmentTextureNode*) snode; - env->filename = path_join(state.base, env->filename); + env->filename = path_join(state.base, env->filename.string()); } if(snode) { |