From 35cbc9a41d530a50bbadd2bddde22ae2756b7bdf Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 3 Feb 2015 18:40:55 -0800 Subject: [PATCH] pass FBXGeometry by const reference this fixes a bug on windows about misaligned data in function call --- interface/src/ModelUploader.cpp | 2 +- interface/src/ModelUploader.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp index a3e9a0a281..d5cd9935e3 100644 --- a/interface/src/ModelUploader.cpp +++ b/interface/src/ModelUploader.cpp @@ -265,7 +265,7 @@ bool ModelUploader::zip() { return true; } -void ModelUploader::populateBasicMapping(QVariantHash& mapping, QString filename, FBXGeometry geometry) { +void ModelUploader::populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry) { if (!mapping.contains(NAME_FIELD)) { mapping.insert(NAME_FIELD, QFileInfo(filename).baseName()); } diff --git a/interface/src/ModelUploader.h b/interface/src/ModelUploader.h index eafb07c4b0..7bbc3c94a8 100644 --- a/interface/src/ModelUploader.h +++ b/interface/src/ModelUploader.h @@ -53,7 +53,7 @@ private: ModelUploader(ModelType type); ~ModelUploader(); - void populateBasicMapping(QVariantHash& mapping, QString filename, FBXGeometry geometry); + void populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry); bool zip(); bool addTextures(const QString& texdir, const FBXGeometry& geometry); bool addPart(const QString& path, const QString& name, bool isTexture = false);