From 2875cb99bb9dc7991aec976475c7acbe48168cca Mon Sep 17 00:00:00 2001 From: samcake Date: Mon, 21 Sep 2015 09:47:00 -0700 Subject: [PATCH] Fixing the compilation issue --- libraries/model/src/model/TextureMap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/model/src/model/TextureMap.cpp b/libraries/model/src/model/TextureMap.cpp index f055f5e6fd..0dd7bca754 100755 --- a/libraries/model/src/model/TextureMap.cpp +++ b/libraries/model/src/model/TextureMap.cpp @@ -489,7 +489,7 @@ gpu::Texture* TextureSource::createCubeTextureFromImage(const QImage& srcImage, faces.push_back(image.copy(QRect(layout._faceZNeg._x * faceWidth, layout._faceZNeg._y * faceWidth, faceWidth, faceWidth)).mirrored(layout._faceZNeg._horizontalMirror, layout._faceZNeg._verticalMirror)); } else { qCDebug(modelLog) << "Failed to find a known cube map layout from this image:" << QString(srcImageName.c_str()); - return; + return nullptr; } // If the 6 faces have been created go on and define the true Texture