From 2f7fbb1f39f8c3b89c94699d25a2ccc35f1e8912 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Fri, 5 Feb 2016 23:00:12 +0100
Subject: [PATCH] Uncomment old Progressbar from Kameleon to make jenkins
 compile again

---
 modules/kameleon/src/kameleonwrapper.cpp | 10 +++++-----
 modules/newhorizons/shaders/fov_fs.glsl  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 1ebdf0c3a2..4d88a1895d 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -23,7 +23,7 @@
  ****************************************************************************************/
 
 #include <modules/kameleon/include/kameleonwrapper.h>
-#include <openspace/util/progressbar.h>
+//#include <openspace/util/progressbar.h>
 
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -208,9 +208,9 @@ float* KameleonWrapper::getUniformSampledValues(
 		return glm::clamp(izerotoone, 0, bins-1);
     };
     
-	ProgressBar pb(static_cast<int>(outDimensions.x));
+	//ProgressBar pb(static_cast<int>(outDimensions.x));
     for (int x = 0; x < outDimensions.x; ++x) {
-		pb.print(x);
+		//pb.print(x);
         
 		for (int y = 0; y < outDimensions.y; ++y) {
 			for (int z = 0; z < outDimensions.z; ++z) {
@@ -384,9 +384,9 @@ float* KameleonWrapper::getUniformSampledVectorValues(
 	//LDEBUG(zVar << "Min: " << varZMin);
 	//LDEBUG(zVar << "Max: " << varZMax);
 
-	ProgressBar pb(static_cast<int>(outDimensions.x));
+	//ProgressBar pb(static_cast<int>(outDimensions.x));
 	for (int x = 0; x < outDimensions.x; ++x) {
-		pb.print(x);
+		//pb.print(x);
 
 		for (int y = 0; y < outDimensions.y; ++y) {
 			for (int z = 0; z < outDimensions.z; ++z) {
diff --git a/modules/newhorizons/shaders/fov_fs.glsl b/modules/newhorizons/shaders/fov_fs.glsl
index b237b7be71..b8a8b6b9be 100644
--- a/modules/newhorizons/shaders/fov_fs.glsl
+++ b/modules/newhorizons/shaders/fov_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014                                                                    *
+ * Copyright (c) 2014-2016                                                               *
  *                                                                                       *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
  * software and associated documentation files (the "Software"), to deal in the Software *