diff --git a/code/AssimpPCH.cpp b/code/AssimpPCH.cpp index 8d244fdd9..f262c8186 100644 --- a/code/AssimpPCH.cpp +++ b/code/AssimpPCH.cpp @@ -69,21 +69,21 @@ ASSIMP_API unsigned int aiGetVersionRevision () } // ------------------------------------------------------------------------------------------------ -ASSIMP_API aiScene::aiScene() - : mFlags() - , mRootNode() - , mNumMeshes() - , mMeshes() - , mNumMaterials() - , mMaterials() - , mNumAnimations() - , mAnimations() - , mNumTextures() - , mTextures() - , mNumLights() - , mLights() - , mNumCameras() - , mCameras() +ASSIMP_API aiScene::aiScene() + : mFlags(0) + , mRootNode(NULL) + , mNumMeshes(0) + , mMeshes(NULL) + , mNumMaterials(0) + , mMaterials(NULL) + , mNumAnimations(0) + , mAnimations(NULL) + , mNumTextures(0) + , mTextures(NULL) + , mNumLights(0) + , mLights(NULL) + , mNumCameras(0) + , mCameras(NULL) , mPrivate(new Assimp::ScenePrivateData()) { } diff --git a/include/assimp/scene.h b/include/assimp/scene.h index e1d131109..506759419 100644 --- a/include/assimp/scene.h +++ b/include/assimp/scene.h @@ -122,14 +122,14 @@ struct aiNode #ifdef __cplusplus /** Constructor */ aiNode() - // set all members to zero by default - : mName() - , mParent() - , mNumChildren() - , mChildren() - , mNumMeshes() - , mMeshes() - , mMetaData() + // set all members to zero by default + : mName("") + , mParent(NULL) + , mNumChildren(0) + , mChildren(NULL) + , mNumMeshes(0) + , mMeshes(NULL) + , mMetaData(NULL) { } @@ -137,13 +137,13 @@ struct aiNode /** Construction from a specific name */ aiNode(const std::string& name) // set all members to zero by default - : mName(name) - , mParent() - , mNumChildren() - , mChildren() - , mNumMeshes() - , mMeshes() - , mMetaData() + : mName(name) + , mParent(NULL) + , mNumChildren(0) + , mChildren(NULL) + , mNumMeshes(0) + , mMeshes(NULL) + , mMetaData(NULL) { }