From 7ecd3a5e73966ec5332019414825436d5a2176d9 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Mon, 13 Sep 2010 21:35:46 +0200
Subject: [PATCH] updated nvidia suppressions file for valgrind, fixed path
 resolution error in mitsuba.cpp

---
 .hgignore               |  1 +
 src/mitsuba/mitsuba.cpp |  3 ++-
 src/shapes/obj.cpp      |  4 ++++
 tools/linux/nvidia.supp | 20 ++++++++++----------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.hgignore b/.hgignore
index 1f82d03a..61c2f453 100644
--- a/.hgignore
+++ b/.hgignore
@@ -60,3 +60,4 @@ tools/windows/mitsuba_res.res
 ^.externalToolBuilders/.*$
 ^.settings/.*$
 ^.cproject$
+^.project$
diff --git a/src/mitsuba/mitsuba.cpp b/src/mitsuba/mitsuba.cpp
index 46efd47c..f51f8768 100644
--- a/src/mitsuba/mitsuba.cpp
+++ b/src/mitsuba/mitsuba.cpp
@@ -95,7 +95,7 @@ int ubi_main(int argc, char **argv) {
 					networkHosts = "", destFile="";
 		bool quietMode = false, progressBars = true, skipExisting = false;
 		ELogLevel logLevel = EInfo;
-		FileResolver *fileResolver = Thread::getThread()->getFileResolver();
+		ref<FileResolver> fileResolver = Thread::getThread()->getFileResolver();
 		bool testCaseMode = false;
 		std::map<std::string, std::string> parameters;
 		int blockSize = 32;
@@ -296,6 +296,7 @@ int ubi_main(int argc, char **argv) {
 				baseName = fs::basename(filename);
 			ref<FileResolver> frClone = fileResolver->clone();
 			frClone->addPath(filePath);
+			Thread::getThread()->setFileResolver(frClone);
 
 			SLog(EInfo, "Parsing scene description from \"%s\" ..", argv[i]);
 
diff --git a/src/shapes/obj.cpp b/src/shapes/obj.cpp
index d8cd435f..f3276938 100644
--- a/src/shapes/obj.cpp
+++ b/src/shapes/obj.cpp
@@ -277,8 +277,12 @@ public:
 				vertex.v = vertices.at(vertexId);
 				if (hasNormals)
 					vertex.n = normals.at(normalId);
+				else
+					vertex.n = Normal(0.0f);
 				if (hasTexcoords)
 					vertex.uv = texcoords.at(uvId);
+				else
+					vertex.uv = Point2(0.0f);
 
 				if (vertexMap.find(vertex) != vertexMap.end()) {
 					key = vertexMap[vertex];
diff --git a/tools/linux/nvidia.supp b/tools/linux/nvidia.supp
index 6cbb1ed4..c2973969 100644
--- a/tools/linux/nvidia.supp
+++ b/tools/linux/nvidia.supp
@@ -1,7 +1,7 @@
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*
@@ -14,7 +14,7 @@
    <insert_a_suppression_name_here>
    Memcheck:Cond
    fun:strcpy
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*
@@ -26,7 +26,7 @@
 {
    <insert_a_suppression_name_here>
    Memcheck:Value8
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*
@@ -39,7 +39,7 @@
    <insert_a_suppression_name_here>
    Memcheck:Cond
    fun:strcmp
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*
@@ -52,7 +52,7 @@
    <insert_a_suppression_name_here>
    Memcheck:Cond
    fun:strlen
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*
@@ -64,23 +64,23 @@
 {
    <insert_a_suppression_name_here>
    Memcheck:Cond
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
 }
 {
    <insert_a_suppression_name_here>
    Memcheck:Param
    ioctl(generic)
    fun:ioctl
-   obj:/usr/lib/libGLcore.so.195.36.31
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
+   obj:/usr/lib/libnvidia-glcore.so.256.44
 }
 {
    <insert_a_suppression_name_here>
    Memcheck:Param
    ioctl(generic)
    fun:ioctl
-   obj:/usr/lib/libGLcore.so.195.36.31
-   obj:/usr/lib/libGLcore.so.195.36.31
+   obj:/usr/lib/libnvidia-glcore.so.256.44
+   obj:/usr/lib/libnvidia-glcore.so.256.44
    obj:*
    obj:*
    obj:*