Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qmap initialized

Browse source
This commit is contained in:
Luis Cuenca 2017-09-13 07:04:50 -07:00
parent f25288178b
commit 68bce3c09c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/fbx/src/GLTFReader.cpp
View file

@ -314,8 +314,8 @@ bool GLTFReader::addImage(const QJsonObject& object) {
bool GLTFReader::getIndexFromObject(const QJsonObject& object, const QString& field, int& outidx, QMap<QString, bool>& defined) {
QJsonObject subobject;
QMap<QString, bool> tmpdefined;
if (getObjectVal(object, field, subobject, defined)) {
QMap<QString, bool> tmpdefined = QMap<QString, bool>();
return getIntVal(subobject, "index", outidx, tmpdefined);
}
return false;
@ -326,7 +326,6 @@ bool GLTFReader::addMaterial(const QJsonObject& object) {
getStringVal(object, "name", material.name, material.defined);
getDoubleArrayVal(object, "emissiveFactor", material.emissiveFactor, material.defined);
//getIntVal(object, "emissiveTexture", material.emissiveTexture, material.defined);
getIndexFromObject(object, "emissiveTexture", material.emissiveTexture, material.defined);
getIndexFromObject(object, "normalTexture", material.normalTexture, material.defined);
getIndexFromObject(object, "occlusionTexture", material.occlusionTexture, material.defined);