summaryrefslogtreecommitdiff
path: root/thirdparty/assimp/code/FBX/FBXExportNode.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-09 10:42:18 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-03-09 10:42:18 +0100
commitda1f80c1f2d71aeaee9f57fd19fc2ea4f76c487d (patch)
treee7f0d1caae79f594d43be8d5068a04c285e2c5bc /thirdparty/assimp/code/FBX/FBXExportNode.cpp
parent471271b727fd1dcc716a10f34e615ce61ca6d16e (diff)
Revert "assimp: Sync with upstream 0201fc5"
This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75. It caused a regression in FBX import leading to crashes. Fixes #36908.
Diffstat (limited to 'thirdparty/assimp/code/FBX/FBXExportNode.cpp')
-rw-r--r--thirdparty/assimp/code/FBX/FBXExportNode.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/thirdparty/assimp/code/FBX/FBXExportNode.cpp b/thirdparty/assimp/code/FBX/FBXExportNode.cpp
index 53aa719f45..06c89cee46 100644
--- a/thirdparty/assimp/code/FBX/FBXExportNode.cpp
+++ b/thirdparty/assimp/code/FBX/FBXExportNode.cpp
@@ -2,7 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
-Copyright (c) 2006-2020, assimp team
+Copyright (c) 2006-2019, assimp team
All rights reserved.
@@ -325,9 +325,9 @@ void FBX::Node::BeginBinary(Assimp::StreamWriterLE &s)
this->start_pos = s.Tell();
// placeholders for end pos and property section info
- s.PutU8(0); // end pos
- s.PutU8(0); // number of properties
- s.PutU8(0); // total property section length
+ s.PutU4(0); // end pos
+ s.PutU4(0); // number of properties
+ s.PutU4(0); // total property section length
// node name
s.PutU1(uint8_t(name.size())); // length of node name
@@ -352,9 +352,9 @@ void FBX::Node::EndPropertiesBinary(
size_t pos = s.Tell();
ai_assert(pos > property_start);
size_t property_section_size = pos - property_start;
- s.Seek(start_pos + 8); // 8 bytes of uint64_t of end_pos
- s.PutU8(num_properties);
- s.PutU8(property_section_size);
+ s.Seek(start_pos + 4);
+ s.PutU4(uint32_t(num_properties));
+ s.PutU4(uint32_t(property_section_size));
s.Seek(pos);
}
@@ -375,7 +375,7 @@ void FBX::Node::EndBinary(
// now go back and write initial pos
this->end_pos = s.Tell();
s.Seek(start_pos);
- s.PutU8(end_pos);
+ s.PutU4(uint32_t(end_pos));
s.Seek(end_pos);
}