Merging r6250 through r6254 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@@ -1267,13 +1267,13 @@ irr::core::stringc CColladaMeshWriter::pathToURI(const irr::io::path& path) cons
|
||||
|
||||
// is this a relative path?
|
||||
if ( path.size() > 1
|
||||
&& path[0] != _IRR_TEXT('/')
|
||||
&& path[0] != _IRR_TEXT('\\')
|
||||
&& path[1] != _IRR_TEXT(':') )
|
||||
&& path[0] != IRR_TEXT('/')
|
||||
&& path[0] != IRR_TEXT('\\')
|
||||
&& path[1] != IRR_TEXT(':') )
|
||||
{
|
||||
// not already starting with "./" ?
|
||||
if ( path[0] != _IRR_TEXT('.')
|
||||
|| path[1] != _IRR_TEXT('/') )
|
||||
if ( path[0] != IRR_TEXT('.')
|
||||
|| path[1] != IRR_TEXT('/') )
|
||||
{
|
||||
result.append("./");
|
||||
}
|
||||
|
Reference in New Issue
Block a user