Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 03:14:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/kasen/core' into blendshapes

Browse source
This commit is contained in:
HifiExperiments 2020-04-16 16:59:24 -07:00
commit 6b3b475a10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/FrameReader.cpp
View file

@ -734,7 +734,7 @@ BatchPointer Deserializer::readBatch(const json& node) {
std::string batchName;
if (node.count(keys::name)) {
batchName = node[keys::name];
batchName = node.value(keys::name, "");
}
BatchPointer result = std::make_shared<Batch>(batchName);
auto& batch = *result;

6
scripts/system/more/app-more.js
View file

@ -11,7 +11,8 @@
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
//
(function() {
var ROOT = Script.resolvePath('').split("app-more.js")[0];
var APP_NAME = "MORE...";
@ -68,8 +69,7 @@
if (instruction.action === "installScript") {
if (lastProcessing.action !== instruction.action || lastProcessing.script !== instruction.script) {
ScriptDiscoveryService.loadOneScript(instruction.script);
lastProcessing.action = instruction.action;
ScriptDiscoveryService.loadScript(instruction.script, true, false, false, true, false); // Force reload the script, do not use cache. lastProcessing.action = instruction.action;
lastProcessing.script = instruction.script;
Script.setTimeout(function() {
sendRunningScriptList();