From 490f119d858ff4a7bed9ca810d91cbdd6989fbab Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 6 Feb 2015 11:30:57 -0800 Subject: [PATCH 1/2] Initialize ResouceCacheSharedItems in Agent --- assignment-client/src/Agent.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index cb1666536f..8690342127 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -46,6 +46,8 @@ Agent::Agent(const QByteArray& packet) : _scriptEngine.setParent(this); _scriptEngine.getEntityScriptingInterface()->setPacketSender(&_entityEditSender); + + DependencyManager::set(); } void Agent::readPendingDatagrams() { From 4a3ee02b117b4791ab4dc0653adc86606f0bf042 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 6 Feb 2015 11:31:19 -0800 Subject: [PATCH 2/2] Initialize _entityScriptingInterface in ScriptEngine --- libraries/script-engine/src/ScriptEngine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 08b364b28d..353e215561 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -208,6 +208,8 @@ void ScriptEngine::init() { _isInitialized = true; + _entityScriptingInterface.init(); + // register various meta-types registerMetaTypes(this); registerMIDIMetaTypes(this);