From 1204c32430f89d57bfe41a9512086c9ea6d1b532 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 25 Jun 2016 16:13:56 +0100 Subject: [PATCH] Changed back to requiring osgDB namespace so it's clearer where function comes from. --- include/osgDB/FileNameUtils | 2 +- src/osgPlugins/3ds/WriterNodeVisitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/osgDB/FileNameUtils b/include/osgDB/FileNameUtils index 49c968769..da9b11424 100644 --- a/include/osgDB/FileNameUtils +++ b/include/osgDB/FileNameUtils @@ -135,7 +135,7 @@ struct FileNameComparator 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)); } diff --git a/src/osgPlugins/3ds/WriterNodeVisitor.cpp b/src/osgPlugins/3ds/WriterNodeVisitor.cpp index 12d49e82c..4e162bfde 100644 --- a/src/osgPlugins/3ds/WriterNodeVisitor.cpp +++ b/src/osgPlugins/3ds/WriterNodeVisitor.cpp @@ -538,7 +538,7 @@ void WriterNodeVisitor::writeMaterials() } 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) if (mat.texture_transparency) tex.flags |= LIB3DS_TEXTURE_ALPHA_SOURCE; else tex.flags &= ~LIB3DS_TEXTURE_ALPHA_SOURCE;