From c43a4eec86193c82d6d150870f684412070fe72c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 20 Apr 2017 13:25:11 -0700 Subject: [PATCH] fix indexOf checks by using lastIndexOf --- tools/oven/src/FBXBaker.cpp | 2 +- tools/oven/src/TextureBaker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/oven/src/FBXBaker.cpp b/tools/oven/src/FBXBaker.cpp index f2fc4c2c96..9b2a30c109 100644 --- a/tools/oven/src/FBXBaker.cpp +++ b/tools/oven/src/FBXBaker.cpp @@ -48,7 +48,7 @@ FBXBaker::FBXBaker(const QUrl& fbxURL, const QString& baseOutputPath, // grab the name of the FBX from the URL, this is used for folder output names auto fileName = fbxURL.fileName(); - _fbxName = fileName.left(fileName.indexOf('.', -1)); + _fbxName = fileName.left(fileName.lastIndexOf('.')); } static const QString BAKED_OUTPUT_SUBFOLDER = "baked/"; diff --git a/tools/oven/src/TextureBaker.cpp b/tools/oven/src/TextureBaker.cpp index 1e22a56b52..03b9fd669d 100644 --- a/tools/oven/src/TextureBaker.cpp +++ b/tools/oven/src/TextureBaker.cpp @@ -31,7 +31,7 @@ TextureBaker::TextureBaker(const QUrl& textureURL, gpu::TextureType textureType, { // figure out the baked texture filename auto originalFilename = textureURL.fileName(); - _bakedTextureFileName = originalFilename.left(originalFilename.indexOf('.', -1)) + BAKED_TEXTURE_EXT; + _bakedTextureFileName = originalFilename.left(originalFilename.lastIndexOf('.')) + BAKED_TEXTURE_EXT; } void TextureBaker::bake() {