Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4242 from huffman/fix-ac-entity-viewer

Browse source 
Fix ac entity viewer
This commit is contained in:
Brad Hefta-Gaub 2015-02-06 12:01:13 -08:00
commit c90c0b53c3
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/Agent.cpp
View file

@ -46,6 +46,8 @@ Agent::Agent(const QByteArray& packet) :
_scriptEngine.setParent(this); _scriptEngine.setParent(this);
_scriptEngine.getEntityScriptingInterface()->setPacketSender(&_entityEditSender); _scriptEngine.getEntityScriptingInterface()->setPacketSender(&_entityEditSender);
DependencyManager::set<ResouceCacheSharedItems>();
} }
void Agent::readPendingDatagrams() { void Agent::readPendingDatagrams() {

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -208,6 +208,8 @@ void ScriptEngine::init() {
_isInitialized = true; _isInitialized = true;
_entityScriptingInterface.init();
// register various meta-types // register various meta-types
registerMetaTypes(this); registerMetaTypes(this);
registerMIDIMetaTypes(this); registerMIDIMetaTypes(this);