From c29b3a8c351aae118df25e918bcccee9a4620976 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Mon, 18 Mar 2019 10:20:10 -0700 Subject: [PATCH] Bypass signals in JSBaker/MaterialBaker when resource is already loaded --- libraries/baking/src/JSBaker.cpp | 2 +- libraries/baking/src/MaterialBaker.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/baking/src/JSBaker.cpp b/libraries/baking/src/JSBaker.cpp index e5682cde20..96d7247a82 100644 --- a/libraries/baking/src/JSBaker.cpp +++ b/libraries/baking/src/JSBaker.cpp @@ -36,7 +36,7 @@ void JSBaker::bake() { loadScript(); } else { // we already have a script passed to us, use that - emit originalScriptLoaded(); + processScript(); } } diff --git a/libraries/baking/src/MaterialBaker.cpp b/libraries/baking/src/MaterialBaker.cpp index 47604fa7dc..458e8ad482 100644 --- a/libraries/baking/src/MaterialBaker.cpp +++ b/libraries/baking/src/MaterialBaker.cpp @@ -57,7 +57,7 @@ void MaterialBaker::bake() { } else { // we already have a material passed to us, use that if (_materialResource->isLoaded()) { - emit originalMaterialLoaded(); + processMaterial(); } else { connect(_materialResource.data(), &Resource::finished, this, &MaterialBaker::originalMaterialLoaded); }