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

Merge pull request #2328 from lerppana/bugfix/ambiguous_calls 

Bugfix issue: #2327 Build broken on clang-7.0.1
pull/2329/head
Kim Kulling 2019-02-07 10:10:59 +01:00 committed by GitHub
parent cfeb0060a2 cc276c3180
commit 06392394ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/glTF2AssetWriter.inl
View File

@ -97,10 +97,10 @@ namespace glTF2 {
inline void Write(Value& obj, Accessor& a, AssetWriter& w) inline void Write(Value& obj, Accessor& a, AssetWriter& w)
{ {
obj.AddMember("bufferView", a.bufferView->index, w.mAl); obj.AddMember("bufferView", a.bufferView->index, w.mAl);
obj.AddMember("byteOffset", a.byteOffset, w.mAl); obj.AddMember("byteOffset", (unsigned int)a.byteOffset, w.mAl);
obj.AddMember("componentType", int(a.componentType), w.mAl); obj.AddMember("componentType", int(a.componentType), w.mAl);
obj.AddMember("count", a.count, w.mAl); obj.AddMember("count", (unsigned int)a.count, w.mAl);
obj.AddMember("type", StringRef(AttribType::ToString(a.type)), w.mAl); obj.AddMember("type", StringRef(AttribType::ToString(a.type)), w.mAl);
Value vTmpMax, vTmpMin; Value vTmpMax, vTmpMin;