Added fix for OSX systems. Add some tool tips in the General Settings

tab.
amirpavlo · Dec 11, 2014 · d790d7f · d790d7f
1 parent 17914c9
commit d790d7f
Show file tree

Hide file tree

Showing 12 changed files with 9,098 additions and 9,032 deletions.
diff --git a/AwesomeBump.pro b/AwesomeBump.pro
@@ -1,28 +1,28 @@
-VPATH += ../shared
-INCLUDEPATH += ../shared
-
-HEADERS       = glwidget.h \
-    mainwindow.h \
-    CommonObjects.h \
-    formimageprop.h \
-    glimageeditor.h
-SOURCES       = glwidget.cpp \
-                main.cpp \
-    mainwindow.cpp \
-    formimageprop.cpp \
-    glimageeditor.cpp \
-    CommonObjects.cpp
-QT           += opengl widgets
-
-# install
-INSTALLS += target
-
-RESOURCES += \
-    content.qrc
-
-FORMS += \
-    mainwindow.ui \
-    formimageprop.ui
-
-OTHER_FILES += \
-    cube.frag
+VPATH += ../shared
+INCLUDEPATH += ../shared
+
+HEADERS       = glwidget.h \
+    mainwindow.h \
+    CommonObjects.h \
+    formimageprop.h \
+    glimageeditor.h
+SOURCES       = glwidget.cpp \
+                main.cpp \
+    mainwindow.cpp \
+    formimageprop.cpp \
+    glimageeditor.cpp \
+    CommonObjects.cpp
+QT           += opengl widgets
+
+# install
+INSTALLS += target
+
+RESOURCES += \
+    content.qrc
+
+FORMS += \
+    mainwindow.ui \
+    formimageprop.ui
+
+OTHER_FILES += \
+    cube.frag
diff --git a/CommonObjects.cpp b/CommonObjects.cpp
@@ -1,11 +1,11 @@
-#include "CommonObjects.h"
-
-bool  FBOImageProporties::bMakeSeamless      = false;
-float FBOImageProporties::MakeSeamlessRadius = 0.5;
-
-
-QString  PostfixNames::diffuseName    = "_d";
-QString  PostfixNames::normalName     = "_n";
-QString  PostfixNames::specularName   = "_s";
-QString  PostfixNames::heightName     = "_h";
-QString  PostfixNames::occlusionName  = "_o";
+#include "CommonObjects.h"
+
+bool  FBOImageProporties::bMakeSeamless      = false;
+float FBOImageProporties::MakeSeamlessRadius = 0.5;
+
+
+QString  PostfixNames::diffuseName    = "_d";
+QString  PostfixNames::normalName     = "_n";
+QString  PostfixNames::specularName   = "_s";
+QString  PostfixNames::heightName     = "_h";
+QString  PostfixNames::occlusionName  = "_o";