projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b9cfff8
)
Update 3DSLoader.cpp
author
vkovalev123
<vkovalev@gkmsoft.ru>
Thu, 14 Sep 2017 11:55:02 +0000
(14:55 +0300)
committer
GitHub
<noreply@github.com>
Thu, 14 Sep 2017 11:55:02 +0000
(14:55 +0300)
Fixed reading of CHINK_RGBF. If reading performs on x32 platform then reading will execute right, but on x64 it`s wrong because it will read 8 bytes instead 4.
code/3DSLoader.cpp
patch
|
blob
|
history
diff --git
a/code/3DSLoader.cpp
b/code/3DSLoader.cpp
index
522bec3
..
704884a
100644
(file)
--- a/
code/3DSLoader.cpp
+++ b/
code/3DSLoader.cpp
@@
-1381,7
+1381,7
@@
void Discreet3DSImporter::ParseColorChunk( aiColor3D* out, bool acceptPercent )
bGamma = true;
case Discreet3DS::CHUNK_RGBF:
- if (sizeof(
ai_real
) * 3 > diff) {
+ if (sizeof(
float
) * 3 > diff) {
*out = clrError;
return;
}