* refactor ScriptCache per FIXMEs * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration

humbletim committed 9 years ago

Commit 831bf931 parent e6142d914 files · +286 −257Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 14 files). Show all

Unified · Split

@@ -27,6 +27,8 @@ · 26 unmodified lines
27	27
28	28	static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
29	29
	30	+static const bool HIFI_SCRIPT_DEBUGGABLES { true };
	31	+
30	32	ScriptsModel& getScriptsModel() {
31	33	static ScriptsModel scriptsModel;
32	34	return scriptsModel;
@@ -517,8 +519,9 @@ void ScriptEngines::launchScriptEngine(ScriptEngine* scriptEngine) { · 484 unmodified lines
517	519	for (auto initializer : _scriptInitializers) {
518	520	initializer(scriptEngine);
519	521	}
520		−
521		− if (scriptEngine->isDebuggable() \|\| (qApp->queryKeyboardModifiers() & Qt::ShiftModifier)) {
	522	+
	523	+ auto const wantDebug = scriptEngine->isDebuggable() \|\| (qApp->queryKeyboardModifiers() & Qt::ShiftModifier);
	524	+ if (HIFI_SCRIPT_DEBUGGABLES && wantDebug) {
522	525	scriptEngine->runDebuggable();
523	526	} else {
524	527	scriptEngine->runInThread();