From 646f2b6a980eb8b709b43a9294047a78e2b2462a Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Wed, 14 Sep 2011 14:12:22 -0400
Subject: [PATCH] don't recompile the entire renderer just because the version
 number changed

---
 include/mitsuba/mitsuba.h    | 1 -
 src/converter/collada.cpp    | 1 +
 src/converter/mtsimport.cpp  | 1 +
 src/converter/obj.cpp        | 1 +
 src/libcore/bitmap.cpp       | 3 ++-
 src/libcore/plugin.cpp       | 1 +
 src/libcore/sched_remote.cpp | 1 +
 src/mitsuba/mtssrv.cpp       | 1 +
 src/mitsuba/mtsutil.cpp      | 1 +
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/mitsuba/mitsuba.h b/include/mitsuba/mitsuba.h
index cfbbc4f9..b4457d7e 100644
--- a/include/mitsuba/mitsuba.h
+++ b/include/mitsuba/mitsuba.h
@@ -49,7 +49,6 @@ typedef float Float;
 /**
  * Include a basic subset of the core classes
  */
-#include <mitsuba/core/version.h>
 #include <mitsuba/core/constants.h>
 #include <mitsuba/core/fwd.h>
 #include <mitsuba/render/fwd.h>
diff --git a/src/converter/collada.cpp b/src/converter/collada.cpp
index 88534ad6..071fccc6 100644
--- a/src/converter/collada.cpp
+++ b/src/converter/collada.cpp
@@ -21,6 +21,7 @@
 #include <mitsuba/core/fresolver.h>
 #include <mitsuba/core/fstream.h>
 #include <mitsuba/core/timer.h>
+#include <mitsuba/core/version.h>
 #include <mitsuba/render/track.h>
 #include <dom/domCOLLADA.h>
 #include <dae.h>
diff --git a/src/converter/mtsimport.cpp b/src/converter/mtsimport.cpp
index efc3f2d2..f6e08f50 100644
--- a/src/converter/mtsimport.cpp
+++ b/src/converter/mtsimport.cpp
@@ -31,6 +31,7 @@
 #include <mitsuba/hw/glrenderer.h>
 #include <mitsuba/core/plugin.h>
 #include <mitsuba/core/statistics.h>
+#include <mitsuba/core/version.h>
 #if defined(WIN32)
 #include <mitsuba/core/getopt.h>
 #endif
diff --git a/src/converter/obj.cpp b/src/converter/obj.cpp
index 56be9bec..f089a439 100644
--- a/src/converter/obj.cpp
+++ b/src/converter/obj.cpp
@@ -21,6 +21,7 @@
 
 #include <mitsuba/core/plugin.h>
 #include <mitsuba/core/fstream.h>
+#include <mitsuba/core/version.h>
 #include <mitsuba/render/scene.h>
 #include <boost/filesystem/fstream.hpp>
 #include "converter.h"
diff --git a/src/libcore/bitmap.cpp b/src/libcore/bitmap.cpp
index 4b9178ab..64bfa705 100644
--- a/src/libcore/bitmap.cpp
+++ b/src/libcore/bitmap.cpp
@@ -18,6 +18,7 @@
 
 #include <mitsuba/core/bitmap.h>
 #include <mitsuba/core/fstream.h>
+#include <mitsuba/core/version.h>
 
 #if defined(WIN32)
 #undef _CRT_SECURE_NO_WARNINGS
@@ -660,7 +661,7 @@ void Bitmap::savePNG(Stream *stream, int compression) const {
 
 	memset(text, 0, sizeof(png_text)*4);
 	text[0].key = (char *) "Generated by";
-	text[0].text =  (char *) "Vitsuba version " MTS_VERSION;
+	text[0].text =  (char *) "Mitsuba version " MTS_VERSION;
 	text[0].compression = PNG_TEXT_COMPRESSION_NONE;
 	text[1].key = (char *) "Title";
 	text[1].text = (char *) m_title.c_str();
diff --git a/src/libcore/plugin.cpp b/src/libcore/plugin.cpp
index b2f43639..0e25f418 100644
--- a/src/libcore/plugin.cpp
+++ b/src/libcore/plugin.cpp
@@ -22,6 +22,7 @@
 #include <mitsuba/core/lock.h>
 #include <mitsuba/core/fresolver.h>
 #include <mitsuba/core/cobject.h>
+#include <mitsuba/core/version.h>
 
 #if !defined(WIN32)
 #include <dlfcn.h>
diff --git a/src/libcore/sched_remote.cpp b/src/libcore/sched_remote.cpp
index f0a3a0ff..e4ede9f4 100644
--- a/src/libcore/sched_remote.cpp
+++ b/src/libcore/sched_remote.cpp
@@ -20,6 +20,7 @@
 #include <mitsuba/core/sstream.h>
 #include <mitsuba/core/mstream.h>
 #include <mitsuba/core/plugin.h>
+#include <mitsuba/core/version.h>
 
 MTS_NAMESPACE_BEGIN
 
diff --git a/src/mitsuba/mtssrv.cpp b/src/mitsuba/mtssrv.cpp
index eb4b40c0..8b80c34b 100644
--- a/src/mitsuba/mtssrv.cpp
+++ b/src/mitsuba/mtssrv.cpp
@@ -23,6 +23,7 @@
 #include <mitsuba/core/sshstream.h>
 #include <mitsuba/core/shvector.h>
 #include <mitsuba/core/appender.h>
+#include <mitsuba/core/version.h>
 #include <mitsuba/core/fresolver.h>
 #include <mitsuba/core/plugin.h>
 #include <fstream>
diff --git a/src/mitsuba/mtsutil.cpp b/src/mitsuba/mtsutil.cpp
index 9561a8fd..e19c6063 100644
--- a/src/mitsuba/mtsutil.cpp
+++ b/src/mitsuba/mtsutil.cpp
@@ -24,6 +24,7 @@
 #include <mitsuba/core/shvector.h>
 #include <mitsuba/core/statistics.h>
 #include <mitsuba/core/fresolver.h>
+#include <mitsuba/core/version.h>
 #include <mitsuba/core/appender.h>
 #include <mitsuba/render/util.h>
 #include <mitsuba/render/renderjob.h>