From 25a9716642ca48c294c7f104fb641dc00b411c29 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 20 Sep 2020 02:08:22 +0200 Subject: [PATCH] Fix crash due to incorrect assert --- libraries/script-engine/src/ScriptEngine.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index c5953b5730..fe3bccd543 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -666,14 +666,11 @@ void avatarDataFromScriptValue(const QScriptValue& object, ScriptAvatarData*& ou } QScriptValue externalResourceBucketToScriptValue(QScriptEngine* engine, ExternalResource::Bucket const& in) { - //return engine->newQObject(in, QScriptEngine::ScriptOwnership, DEFAULT_QOBJECT_WRAP_OPTIONS); return QScriptValue((int)in); } void externalResourceBucketFromScriptValue(const QScriptValue& object, ExternalResource::Bucket& out) { - // This is not implemented because there are no slots/properties that take an AvatarSharedPointer from a script - assert(false); - out = ExternalResource::Bucket::Assets; + out = static_cast(object.toInt32()); } void ScriptEngine::resetModuleCache(bool deleteScriptCache) {