From 14749ea3b3b3dd7345ecc49ce983cc0b1f7da90c Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Tue, 11 Apr 2006 05:01:56 +0000 Subject: [PATCH] A fix for BTM_relative --- panda/src/gobj/texture.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx index 2b2fa35e6a..35beda4ce7 100644 --- a/panda/src/gobj/texture.cxx +++ b/panda/src/gobj/texture.cxx @@ -3322,7 +3322,8 @@ write_datagram(BamWriter *manager, Datagram &me) { case BTM_relative: filename = get_fullpath(); alpha_filename = get_alpha_fullpath(); - if (!has_bam_dir || filename.find_on_searchpath(bam_dir) == -1) { + bam_dir.make_absolute(); + if (!has_bam_dir || !filename.make_relative_to(bam_dir, true)) { if (filename.find_on_searchpath(get_texture_path()) == -1) { filename.find_on_searchpath(get_model_path()); } @@ -3332,7 +3333,7 @@ write_datagram(BamWriter *manager, Datagram &me) { << "Texture file " << get_filename() << " found as " << filename << "\n"; } - if (!has_bam_dir || alpha_filename.find_on_searchpath(bam_dir) == -1) { + if (!has_bam_dir || !alpha_filename.make_relative_to(bam_dir, true)) { if (alpha_filename.find_on_searchpath(get_texture_path()) == -1) { alpha_filename.find_on_searchpath(get_model_path()); }