FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed back to requiring osgDB namespace so it's clearer where function comes from.

Browse Source
This commit is contained in:
Robert Osfield 2016-06-25 16:13:56 +01:00
parent 94266eee50
commit 1204c32430
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/FileNameUtils
View File

@ -135,7 +135,7 @@ struct FileNameComparator
void stringcopy(char* dest, const char* src, size_t length); void stringcopy(char* dest, const char* src, size_t length);
#define stringcopyfixedsize(DEST, SRC) osgDB::stringcopy(DEST, SRC, sizeof(DEST)); #define stringcopyfixedsize(DEST, SRC) stringcopy(DEST, SRC, sizeof(DEST));
} }

2
src/osgPlugins/3ds/WriterNodeVisitor.cpp
View File

@ -538,7 +538,7 @@ void WriterNodeVisitor::writeMaterials()
} }
Lib3dsTextureMap & tex = mat3ds->texture1_map; Lib3dsTextureMap & tex = mat3ds->texture1_map;
stringcopyfixedsize(tex.name, path.c_str()); osgDB::stringcopyfixedsize(tex.name, path.c_str());
// Here we don't assume anything about initial flags state (actually it is set to LIB3DS_TEXTURE_NO_TILE by lib3DS, but this is subject to change) // Here we don't assume anything about initial flags state (actually it is set to LIB3DS_TEXTURE_NO_TILE by lib3DS, but this is subject to change)
if (mat.texture_transparency) tex.flags |= LIB3DS_TEXTURE_ALPHA_SOURCE; if (mat.texture_transparency) tex.flags |= LIB3DS_TEXTURE_ALPHA_SOURCE;
else tex.flags &= ~LIB3DS_TEXTURE_ALPHA_SOURCE; else tex.flags &= ~LIB3DS_TEXTURE_ALPHA_SOURCE;