Skip to content

Commit

Permalink
Main: Technique - do not add superfluous newline to compileErrors
Browse files Browse the repository at this point in the history
  • Loading branch information
paroj committed Nov 26, 2023
1 parent f686a64 commit f956ec5
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions OgreMain/src/OgreTechnique.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,15 @@ namespace Ogre {
{
// The user disabled auto pass split
compileErrors << "Pass " << passNum <<
": Too many texture units for the current hardware and no splitting allowed."
<< std::endl;
": Too many texture units for the current hardware and no splitting allowed";
return false;
}
else if (currPass->hasVertexProgram())
{
// Can't do this one, and can't split a programmable pass
compileErrors << "Pass " << passNum <<
": Too many texture units for the current hardware and "
"cannot split programmable passes."
<< std::endl;
"cannot split programmable passes";
return false;
}
}
Expand Down Expand Up @@ -198,13 +196,12 @@ namespace Ogre {
": " << GpuProgram::getProgramTypeName(programType) + " program " << program->getName()
<< " cannot be used - ";
if (program->hasCompileError() && program->getSource().empty())
compileErrors << "resource not found.";
compileErrors << "resource not found";
else if (program->hasCompileError())
compileErrors << "compile error.";
compileErrors << "compile error";
else
compileErrors << "not supported.";
compileErrors << "not supported";

compileErrors << std::endl;
return false;
}
}
Expand Down

0 comments on commit f956ec5

Please sign in to comment.