Commit Graph

4 Commits

Author SHA1 Message Date
Kim Kulling
c4d98ced49 Merge branch 'master' into kimkulling_dev 2020-01-18 14:05:51 +01:00
Kim Kulling
40d882af4f fix irrreader leak. 2020-01-16 20:25:47 +01:00
Matthias Moulin
715337aa0b Suppressed MSVC++ warning C4244
'return': conversion from '__int64' to 'int', possible loss of data
2020-01-16 18:21:28 +01:00
kkulling
b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00