Merge branch 'master' into x3d_pugi_migration_artenuvielle

include/assimp/scene.h

@@ -437,7 +437,7 @@ struct aiScene
 };
 
 #ifdef __cplusplus
-} //! namespace Assimp
-#endif
+} 
+#endif //! extern "C"
 
 #endif // AI_SCENE_H_INC