v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop_kimkulling

pull/1871/head
Kim Kulling 2018-04-06 18:13:04 +02:00 committed by GitHub
parent 0a3fb04b04 c269e9329e
commit 44c62042f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/assimp/StreamReader.h
View File

@ -283,7 +283,6 @@ public:
return *this; return *this;
} }
private:
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** Generic read method. ByteSwap::Swap(T*) *must* be defined */ /** Generic read method. ByteSwap::Swap(T*) *must* be defined */
template <typename T> template <typename T>
@ -300,6 +299,7 @@ private:
return f; return f;
} }
private:
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
void InternBegin() { void InternBegin() {
if (!stream) { if (!stream) {

2
include/assimp/StreamWriter.h
View File

@ -255,8 +255,6 @@ public:
cursor = new_cursor; cursor = new_cursor;
} }
private:
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
/** Generic write method. ByteSwap::Swap(T*) *must* be defined */ /** Generic write method. ByteSwap::Swap(T*) *must* be defined */
template <typename T> template <typename T>