From 24d53f79b217ff7c62e4c32a49967447a0230fef Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 12 Jun 2016 17:12:25 +0200 Subject: Fix Cycles debug build assert on some platforms, tighten checks to avoid this in the future. --- intern/cycles/app/cycles_xml.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/app/cycles_xml.cpp') 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) { -- cgit v1.2.3