Merge branch 'master' of cgogn:CGoGN

6c3080c2 · Sylvain Thery · af2b3121 · bc2b03f8 · 6c3080c2
Commit 6c3080c2 authored Feb 07, 2013 by Sylvain Thery
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

include/Utils/textures.h include/Utils/textures.h +4 -3

No files found.
--- a/include/Utils/textures.h
+++ b/include/Utils/textures.h
@@ -28,10 +28,11 @@
 #include "Utils/gl_def.h"
 #include "Geometry/vector_gen.h"
 #include <string>
-#include <QImage>

-#ifndef WITH_QT
-#error "Texture class need Qt for loading images, please recompile CGoGN with Qt support"
+#ifdef WITH_QT
+#include <QImage>
+//#else
+//#error "Texture class need Qt for loading images, please recompile CGoGN with Qt support if necessary"
 #endif

 // TODO externaliser le chargement d'image pour enlever la dependance Qt ??