From f08b5e3e277e34cdfb697a2d353e89a38baa2595 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Mon, 8 Apr 2019 11:03:21 -0700 Subject: [PATCH] disable jsbaker (cherry picked from commit 7cbda006a088ec5613dce484514466666ac73b1f) --- tools/oven/src/BakerCLI.cpp | 5 +++-- tools/oven/src/DomainBaker.cpp | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/oven/src/BakerCLI.cpp b/tools/oven/src/BakerCLI.cpp index f09db3ed26..64462a4e37 100644 --- a/tools/oven/src/BakerCLI.cpp +++ b/tools/oven/src/BakerCLI.cpp @@ -55,8 +55,9 @@ void BakerCLI::bakeFile(QUrl inputUrl, const QString& outputPath, const QString& } } } else if (type == SCRIPT_EXTENSION) { - _baker = std::unique_ptr { new JSBaker(inputUrl, outputPath) }; - _baker->moveToThread(Oven::instance().getNextWorkerThread()); + // FIXME: disabled for now because it breaks some scripts + //_baker = std::unique_ptr { new JSBaker(inputUrl, outputPath) }; + //_baker->moveToThread(Oven::instance().getNextWorkerThread()); } else if (type == MATERIAL_EXTENSION) { _baker = std::unique_ptr { new MaterialBaker(inputUrl.toDisplayString(), true, outputPath) }; _baker->moveToThread(Oven::instance().getNextWorkerThread()); diff --git a/tools/oven/src/DomainBaker.cpp b/tools/oven/src/DomainBaker.cpp index b92a310f5d..8a4489fcac 100644 --- a/tools/oven/src/DomainBaker.cpp +++ b/tools/oven/src/DomainBaker.cpp @@ -397,6 +397,8 @@ void DomainBaker::enumerateEntities() { } } + // FIXME: disabled for now because it breaks some scripts + /* // Scripts if (entity.contains(SCRIPT_KEY)) { addScriptBaker(SCRIPT_KEY, entity[SCRIPT_KEY].toString(), *it); @@ -404,6 +406,7 @@ void DomainBaker::enumerateEntities() { if (entity.contains(SERVER_SCRIPTS_KEY)) { // TODO: serverScripts can be multiple scripts, need to handle that } + */ // Materials if (entity.contains(MATERIAL_URL_KEY)) {