History

interface decides on entityIDs rather than bouncing a temporary id through the entity server

Seth Alves committed 11 years ago

Commit f9d46b01 parent f188078104 files · +490 −1235Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−2
@@ -319,9 +319,8 @@ void ScriptEngine::init() { · 318 unmodified lines
319319 registerAudioMetaTypes(this);
320320
321321 qScriptRegisterMetaType(this, EntityItemPropertiesToScriptValue, EntityItemPropertiesFromScriptValue);
322− qScriptRegisterMetaType(this, EntityItemIDtoScriptValue, EntityItemIDfromScriptValue);
323322 qScriptRegisterMetaType(this, RayToEntityIntersectionResultToScriptValue, RayToEntityIntersectionResultFromScriptValue);
324− qScriptRegisterSequenceMetaType<QVector<EntityItemID> >(this);
323+ qScriptRegisterSequenceMetaType<QVector<QUuid> >(this);
325324
326325 qScriptRegisterSequenceMetaType<QVector<glm::vec2> >(this);
327326 qScriptRegisterSequenceMetaType<QVector<glm::quat> >(this);