diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-23 00:31:46 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-23 00:31:46 +0400 |
| commit | f0d5abfcb2b54f6fd7a24220e81e0c88a914d87f (patch) | |
| tree | 328a631d447ea7c7be2a757d092065c721090f82 /source/blender/collada | |
| parent | 1d529d83a0693693878749110a05d8b0fa929d0f (diff) | |
| parent | 6a374d266d8213629f74a9f4c9a4984ddf59ef4c (diff) | |
Merging trunk up to r39637.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 91742727e16..c7c8cb66008 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -109,7 +109,7 @@ set(SRC ) if(WITH_BUILDINFO) - add_definitions(-DNAN_BUILDINFO) + add_definitions(-DWITH_BUILDINFO) endif() if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 32956921f5b..285ab283b37 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -52,7 +52,7 @@ extern "C" #include "BLI_path_util.h" #include "BLI_fileops.h" #include "ED_keyframing.h" -#ifdef NAN_BUILDINFO +#ifdef WITH_BUILDINFO extern char build_rev[]; #endif } @@ -375,7 +375,7 @@ void DocumentExporter::exportCurrentScene(Scene *sce, const char* filename, bool else { asset.getContributor().mAuthor = "Blender User"; } -#ifdef NAN_BUILDINFO +#ifdef WITH_BUILDINFO char version_buf[128]; sprintf(version_buf, "Blender %d.%02d.%d r%s", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION, build_rev); asset.getContributor().mAuthoringTool = version_buf; |