Fix Cycles debug build assert on some platforms, tighten checks to avoid this in...
[blender.git] / intern / cycles / app / cycles_xml.cpp
index 48a2b12b23a24238e05246b8f80dd64128b0415e..3aca46e2dc72be75c3cbc8b27fabb9e0d3d4062d 100644 (file)
@@ -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) {