From 1145bc890484664218dfbcd3bbf438678caf983c Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 14 Nov 2019 08:43:51 +1300 Subject: [PATCH] Fix Graphics.exportModelToOBJ() JavaScript crash --- .../src/graphics-scripting/GraphicsScriptingInterface.cpp | 4 ++-- .../src/graphics-scripting/GraphicsScriptingInterface.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp index d76c1fcbd2..4d95709f15 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp +++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp @@ -258,8 +258,8 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar return scriptable::make_scriptowned(mesh, nullptr); } -QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::ScriptableModel& _in) { - const auto& in = _in.getConstMeshes(); +QString GraphicsScriptingInterface::exportModelToOBJ(const scriptable::ScriptableModelPointer& model) { + const auto& in = model->getConstMeshes(); if (in.size()) { QList meshes; foreach (auto meshProxy, in) { diff --git a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h index 808d3f221f..c1f3be2b3d 100644 --- a/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h +++ b/libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h @@ -93,7 +93,7 @@ public slots: * @param {Graphics.Model} model * @returns {string} */ - QString exportModelToOBJ(const scriptable::ScriptableModel& in); + QString exportModelToOBJ(const scriptable::ScriptableModelPointer& model); private: scriptable::ModelProviderPointer getModelProvider(const QUuid& uuid);