From 3c80767ec38624dfe508d598a7c0d7546b2496bd Mon Sep 17 00:00:00 2001 From: samcake Date: Tue, 3 May 2016 18:43:20 -0700 Subject: [PATCH] Adding the shadingMOdel read from the fbx material --- libraries/fbx/src/FBXReader.cpp | 3 +++ libraries/fbx/src/FBXReader.h | 1 + 2 files changed, 4 insertions(+) diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index 2df388e1d4..3b705ec0b2 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -892,7 +892,10 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS properties = true; propertyName = "P"; index = 4; + } else if (subobject.name == "ShadingModel") { + material.shadingModel = subobject.properties.at(0).toString(); } + if (properties) { std::vector unknowns; foreach(const FBXNode& property, subobject.children) { diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h index c1952fc550..6ba1c5786b 100644 --- a/libraries/fbx/src/FBXReader.h +++ b/libraries/fbx/src/FBXReader.h @@ -154,6 +154,7 @@ public: QString materialID; QString name; + QString shadingModel; model::MaterialPointer _material; FBXTexture normalTexture;