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

Merge branch 'master' into feature/jassimp-classloader

pull/1489/head
Kim Kulling 2017-10-14 15:59:55 +02:00 committed by GitHub
parent a7c1dde56e 01510dfe1b
commit 5e739acfa1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/BlenderDNA.inl
View File

@ -589,7 +589,10 @@ template <> inline void Structure :: Convert<short> (short& dest,const FileData
{ {
// automatic rescaling from short to float and vice versa (seems to be used by normals) // automatic rescaling from short to float and vice versa (seems to be used by normals)
if (name == "float") { if (name == "float") {
dest = static_cast<short>(db.reader->GetF4() * 32767.f); float f = db.reader->GetF4();
if ( f > 1.0f )
f = 1.0f;
dest = static_cast<short>( f * 32767.f);
//db.reader->IncPtr(-4); //db.reader->IncPtr(-4);
return; return;
} }