diff --git a/pandatool/src/egg-palettize/filenameUnifier.cxx b/pandatool/src/egg-palettize/filenameUnifier.cxx index ef71db79fc..9331492b12 100644 --- a/pandatool/src/egg-palettize/filenameUnifier.cxx +++ b/pandatool/src/egg-palettize/filenameUnifier.cxx @@ -128,7 +128,7 @@ make_user_filename(Filename filename) { //////////////////////////////////////////////////////////////////// // Function: FilenameUnifier::make_canonical -// Access: Private, Static +// Access: Public, Static // Description: Does the same thing as Filename::make_canonical()--it // converts the filename to its canonical form--but // caches the operation so that repeated calls to diff --git a/pandatool/src/egg-palettize/filenameUnifier.h b/pandatool/src/egg-palettize/filenameUnifier.h index a604b903ea..b93c7e4108 100644 --- a/pandatool/src/egg-palettize/filenameUnifier.h +++ b/pandatool/src/egg-palettize/filenameUnifier.h @@ -44,9 +44,9 @@ public: static Filename get_bam_filename(Filename filename); static Filename make_egg_filename(Filename filename); static Filename make_user_filename(Filename filename); + static void make_canonical(Filename &filename); private: - static void make_canonical(Filename &filename); static Filename _txa_filename; static Filename _txa_dir; diff --git a/pandatool/src/egg-palettize/textureImage.cxx b/pandatool/src/egg-palettize/textureImage.cxx index 81f2306b00..4859ca1a8f 100644 --- a/pandatool/src/egg-palettize/textureImage.cxx +++ b/pandatool/src/egg-palettize/textureImage.cxx @@ -689,7 +689,7 @@ copy_unplaced(bool redo_all) { placement->get_omit_reason() != OR_unknown) { DestTextureImage *dest = new DestTextureImage(placement); Filename filename = dest->get_filename(); - filename.make_canonical(); + FilenameUnifier::make_canonical(filename); pair insert_result = generate.insert (Dests::value_type(filename, dest));