mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
use FilenameUnifier to make canonical
This commit is contained in:
parent
1f896dbc2b
commit
a5ad0969d4
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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<Dests::iterator, bool> insert_result = generate.insert
|
||||
(Dests::value_type(filename, dest));
|
||||
|
Loading…
x
Reference in New Issue
Block a user