From c99d568c9c078e60731dbf9568dfc5d79b5d326c Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Mon, 19 May 2014 20:45:14 +0200
Subject: [PATCH] bugfixes

---
 src/shapes/obj.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/shapes/obj.cpp b/src/shapes/obj.cpp
index 9b462863..f07369b7 100644
--- a/src/shapes/obj.cpp
+++ b/src/shapes/obj.cpp
@@ -265,7 +265,8 @@ public:
 				if (triangles.size() > 0) {
 					/// make sure that we have unique names
 					if (geomNames.find(targetName) != geomNames.end())
-						targetName = formatString("%s_%i", targetName.c_str(), geomIndex++);
+						targetName = formatString("%s_%i", targetName.c_str(), geomIndex);
+					geomIndex += 1;
 					geomNames.insert(targetName);
 					if (shapeIndex < 0 || geomIndex-1 == shapeIndex)
 						createMesh(targetName, vertices, normals, texcoords,
@@ -280,7 +281,8 @@ public:
 				if (triangles.size() > 0 && !m_collapse) {
 					/// make sure that we have unique names
 					if (geomNames.find(name) != geomNames.end())
-						name = formatString("%s_%i", name.c_str(), geomIndex++);
+						name = formatString("%s_%i", name.c_str(), geomIndex);
+					geomIndex += 1;
 					geomNames.insert(name);
 					if (shapeIndex < 0 || geomIndex-1 == shapeIndex)
 						createMesh(name, vertices, normals, texcoords,
@@ -406,6 +408,7 @@ public:
 		}
 		Properties props("bitmap");
 		props.setString("filename", path.string());
+		props.setFloat("gamma", 1.0f);
 		ref<Texture> texture = static_cast<Texture *> (PluginManager::getInstance()->
 			createObject(MTS_CLASS(Texture), props));
 		texture->configure();