From cc7dd2162bf1dca10901cdee8e300db6ddb97cbe Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 25 Aug 2017 17:00:41 -0700 Subject: [PATCH] fixes for OS X build --- assignment-client/src/assets/AssetServer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 88a1eaeab1..59e0809586 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -66,9 +66,13 @@ void BakeAssetTask::run() { std::unique_ptr baker; if (_assetPath.endsWith(".fbx")) { - baker = std::make_unique(QUrl("file:///" + _filePath), fn, PathUtils::generateTemporaryDir()); + baker = std::unique_ptr { + new FBXBaker(QUrl("file:///" + _filePath), fn, PathUtils::generateTemporaryDir()) + }; } else { - baker = std::make_unique(QUrl("file:///" + _filePath), image::TextureUsage::CUBE_TEXTURE, PathUtils::generateTemporaryDir()); + baker = std::unique_ptr { + new TextureBaker(QUrl("file:///" + _filePath), image::TextureUsage::CUBE_TEXTURE, PathUtils::generateTemporaryDir()) + }; } QEventLoop loop;