Commit 45604c4c authored by Christopher Tenter's avatar Christopher Tenter

set ACG shaderdir on openflipper startup

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19857 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0523dfd1
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <ACG/Scenegraph/DrawModes.hh> #include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/GL/ShaderGenerator.hh>
#include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh> #include <OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh>
#include <QDir> #include <QDir>
#include <QCoreApplication> #include <QCoreApplication>
...@@ -853,6 +854,7 @@ bool initializeSettings() { ...@@ -853,6 +854,7 @@ bool initializeSettings() {
// Set the Path to the Shaders // Set the Path to the Shaders
shaderDir_ = dataDir_; shaderDir_ = dataDir_;
shaderDir_.cd("Shaders"); shaderDir_.cd("Shaders");
ACG::ShaderProgGenerator::setShaderDir(OpenFlipper::Options::shaderDirStr());
// Set the Path to the textures // Set the Path to the textures
textureDir_ = dataDir_; textureDir_ = dataDir_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment