From e99ad75a28265ec1f84f7638dd186369581520d2 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Tue, 22 Sep 2015 18:01:39 -0700
Subject: [PATCH] more warnings fixes

---
 interface/src/devices/3DConnexionClient.cpp |  1 +
 libraries/fbx/src/FBXReader.cpp             |  3 +--
 libraries/fbx/src/FBXReader.h               | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp
index 52b4dce68d..b6f2aa8718 100755
--- a/interface/src/devices/3DConnexionClient.cpp
+++ b/interface/src/devices/3DConnexionClient.cpp
@@ -425,6 +425,7 @@ bool ConnexionClient::InitializeRawInput(HWND hwndTarget) {
         return false;
     }
 
+    // FIXME - http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
     // Get OS version.
     OSVERSIONINFO osvi = { sizeof(OSVERSIONINFO), 0 };
     ::GetVersionEx(&osvi);
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 4acc08314c..da240e826a 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -934,8 +934,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         _textureContent.insert(filename, content);
                     }
                 } else if (object.name == "Material") {
-                    FBXMaterial material = { glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(), 
-                                             glm::vec2(0.f, 1.0f), 96.0f, 1.0f, QString(""), nullptr };
+                    FBXMaterial material(glm::vec3(1.0f, 1.0f, 1.0f), glm::vec3(1.0f), glm::vec3(), glm::vec2(0.f, 1.0f), 96.0f, 1.0f);
                     foreach (const FBXNode& subobject, object.children) {
                         bool properties = false;
                         QByteArray propertyName;
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index 3027eb52cc..5cfff9826f 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -136,6 +136,16 @@ public:
 
 class FBXMaterial {
 public:
+    FBXMaterial() {};
+    FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor, 
+                const glm::vec2& emissiveParams, float shininess, float opacity) :
+                    diffuseColor(diffuseColor),
+                    specularColor(specularColor),
+                    emissiveColor(emissiveColor),
+                    emissiveParams(emissiveParams),
+                    shininess(shininess),
+                    opacity(opacity)  {}
+
     glm::vec3 diffuseColor;
     glm::vec3 specularColor;
     glm::vec3 emissiveColor;