Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 336 vs 337 for /trunk/Source Code/Platform/Video/OpenGL/Shaders/glShader.cpp

Diff revisions: vs.
  @@ -35,8 +35,8 @@
35 35 ERROR_FN(Locale::get("ERROR_GLSL_SHADER_NOT_FOUND"),getName().c_str());
36 36 return false;
37 37 }
38 - stringImpl parsedSource = preprocessIncludes(source, getName(), 0);
39 - Util::trim(parsedSource);
38 + stringImpl parsedSource = preprocessIncludes(source, getName(), 0);
39 + Util::trim(parsedSource);
40 40
41 41 #ifdef NDEBUG
42 42
  @@ -110,10 +110,10 @@
110 110 std::string line;
111 111 stringImpl include_file, include_string, loc;
112 112 ParamHandler& par = ParamHandler::getInstance();
113 - stringImpl shaderAtomLocationPrefix(par.getParam<stringImpl>("assetsLocation", "assets") + "/" +
114 - par.getParam<stringImpl>("shaderLocation", "shaders") + "/GLSL/");
115 - while(std::getline(input, line)) {
116 - if (std::regex_search(line, matches, re)) {
113 + stringImpl shaderAtomLocationPrefix(par.getParam<stringImpl>("assetsLocation", "assets") + "/" +
114 + par.getParam<stringImpl>("shaderLocation", "shaders") + "/GLSL/");
115 + while(std::getline(input, line)) {
116 + if (std::regex_search(line, matches, re)) {
117 117 include_file = stringAlg::toBase(matches[1].str());
118 118
119 119 if(include_file.find("frag") != stringImpl::npos){