Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16490 from ctrlaltdavid/DEV-2742

Browse source 
DEV-2742: Fix Graphics.exportModelToOBJ() JavaScript crash
This commit is contained in:
Shannon Romano 2019-11-15 09:02:08 -08:00 committed by GitHub
commit 3c271aa27a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.cpp
View file

@ -258,8 +258,8 @@ scriptable::ScriptableMeshPointer GraphicsScriptingInterface::newMesh(const QVar
return scriptable::make_scriptowned<scriptable::ScriptableMesh>(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<scriptable::MeshPointer> meshes;
foreach (auto meshProxy, in) {

2
libraries/graphics-scripting/src/graphics-scripting/GraphicsScriptingInterface.h
View file

@ -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);