Merge pull request #45 from assimp/bugfix/fix_build

Fix invalid test for a valid pointer

Author: kimkulling

src/ModelLoading.cpp

@@ -59,7 +59,7 @@ ModelLoadingApp::~ModelLoadingApp() {
 }
 
 bool ModelLoadingApp::hasModel() const {
-    return mModelNode.isValid();
+    return mModelNode != nullptr;
 }
 
 void ModelLoadingApp::pushIntention() {
@@ -256,4 +256,3 @@ void ModelLoadingApp::onUpdate() {
 
     AppBase::onUpdate();
 }
-

src/SceneData.h

@@ -29,17 +29,13 @@ struct aiScene;
 namespace AssimpViewer {
 
 struct SceneData {
-    std::string mAssetName;
-    const aiScene *mScene;
+    std::string mAssetName{"none"};
+    const aiScene *mScene{nullptr};
 
-    SceneData();
+    SceneData() = default;
     ~SceneData() = default;
+    SceneData(const SceneData &) = delete;
+    SceneData &operator=(const SceneData &) = delete;
 };
 
-inline SceneData::SceneData() :
-        mAssetName("none"),
-        mScene(nullptr) {
-    // empty
-}
-
 } // namespace AssimpViewer