Merge branch 'master' of https://github.com/assimp/assimp

2015-07-10 01:21:57 +02:00
parent 14a849b398 ca5ce8f476
commit 5a207dbb19
4 changed files with 25 additions and 23 deletions
--- a/code/ObjFileParser.h
+++ b/code/ObjFileParser.h
@@ -112,9 +112,9 @@ private:
    /// Parse object name
    void getObjectName();
    /// Creates a new object.
-    void createObject(const std::string &strObjectName);
+    void createObject( const std::string &strObjectName );
    /// Creates a new mesh.
-    void createMesh();
+    void createMesh( const std::string &meshName );
    /// Returns true, if a new mesh instance must be created.
    bool needsNewMesh( const std::string &rMaterialName );
    /// Error report in token