Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try fix travis ci produced build errors on gcc and clang.

Browse Source
This commit is contained in:
Jonne Nauha
2014-05-02 01:38:13 +03:00
parent 409c2cf332
commit dcf6002bed
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/OgreMaterial.cpp
+6 -7
View File
@@ -46,7 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sstream>
#include "OgreImporter.h"
#include "irrXMLWrapper.h"
#include "TinyFormatter.h"
using namespace std;
@@ -195,8 +194,8 @@ aiMaterial* OgreImporter::ReadMaterial(const std::string &pFile, Assimp::IOSyste
if (linePart == partTechnique)
{
string techniqueName = Trim(SkipLine(ss));
ReadTechnique(techniqueName, ss, material);
string techniqueName = SkipLine(ss);
ReadTechnique(Trim(techniqueName), ss, material);
}
// Read informations from a custom material
@@ -315,8 +314,8 @@ bool OgreImporter::ReadTechnique(const std::string &techniqueName, stringstream
/// @todo Techniques have other attributes than just passes.
if (linePart == partPass)
{
string passName = Trim(SkipLine(ss));
ReadPass(passName, ss, material);
string passName = SkipLine(ss);
ReadPass(Trim(passName), ss, material);
}
}
return true;
@@ -374,8 +373,8 @@ bool OgreImporter::ReadPass(const std::string &passName, stringstream &ss, aiMat
}
else if (linePart == partTextureUnit)
{
string textureUnitName = Trim(SkipLine(ss));
ReadTextureUnit(textureUnitName, ss, material);
string textureUnitName = SkipLine(ss);
ReadTextureUnit(Trim(textureUnitName), ss, material);
}
}
return true;