mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-01 09:23:03 -04:00
*** empty log message ***
This commit is contained in:
parent
ce89b324f1
commit
a534f2b338
@ -169,7 +169,13 @@ convert_executable_pathname(const string &unix_style_pathname) {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
Filename::
|
Filename::
|
||||||
Filename(const Filename &dirname, const Filename &basename) {
|
Filename(const Filename &dirname, const Filename &basename) {
|
||||||
(*this) = dirname.get_fullpath() + "/" + basename.get_fullpath();
|
if (dirname.empty()) {
|
||||||
|
(*this) = basename;
|
||||||
|
} else if (basename.empty()) {
|
||||||
|
(*this) = dirname;
|
||||||
|
} else {
|
||||||
|
(*this) = dirname.get_fullpath() + "/" + basename.get_fullpath();
|
||||||
|
}
|
||||||
_flags = 0;
|
_flags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user