Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-08-22 20:54:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-22 20:54:26 +0400
commit7d316b70b842ff376d07f5ba55302d31d92e6dbb (patch)
treeebaa36789ba760be6caec274b582341f6702409c /source/blender/collada
parent817273931a42f807809a9d0f000564e2bd38dfb8 (diff)
rename NAN_BUILDINFO --> WITH_BUILDINFO
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/CMakeLists.txt2
-rw-r--r--source/blender/collada/DocumentExporter.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index e2a68d19682..b5c84bc3c84 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -107,7 +107,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 e6e0953680c..b26318f6114 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
}
@@ -1002,7 +1002,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;