From 2b90cb2a69d5bc4464c46b4a1347583b606f73d0 Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Sun, 12 Oct 2014 20:12:40 -0400 Subject: [PATCH] Use case-insensitive comparison for animated textures, for some reason --- src/tracks/track.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 076458a5b..1319d4084 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -1419,6 +1419,9 @@ void Track::handleAnimatedTextures(scene::ISceneNode *node, const XMLNode &xml) continue; } + // to lower case, for case-insensitive comparison + name = StringUtils::toLowerCase(name); + for(unsigned int i=0; igetMaterialCount(); i++) { video::SMaterial &irrMaterial=node->getMaterial(i); @@ -1426,9 +1429,13 @@ void Track::handleAnimatedTextures(scene::ISceneNode *node, const XMLNode &xml) { video::ITexture* t=irrMaterial.getTexture(j); if(!t) continue; - const std::string texture_name = + std::string texture_name = StringUtils::getBasename(core::stringc(t->getName()).c_str()); - if(texture_name!=name) continue; + + // to lower case, for case-insensitive comparison + texture_name = StringUtils::toLowerCase(texture_name); + + if (texture_name != name) continue; core::matrix4 *m = &irrMaterial.getTextureMatrix(j); m_animated_textures.push_back(new MovingTexture(m, *texture_node)); } // for j