TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

* Adjustment: Update Assimp version to 5.0.1.

Browse source
This commit is contained in:
Robert MacGregor 2021-10-21 21:14:55 -04:00
parent 14ebeaf3eb
commit 4758f7bdaf
679 changed files with 50502 additions and 19698 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/lib/assimp/code/Common/scene.cpp
View file

@ -3,7 +3,7 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team
Copyright (c) 2006-2019, assimp team
@ -44,23 +44,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
aiNode::aiNode()
: mName("")
, mParent(nullptr)
, mParent(NULL)
, mNumChildren(0)
, mChildren(nullptr)
, mChildren(NULL)
, mNumMeshes(0)
, mMeshes(nullptr)
, mMetaData(nullptr) {
, mMeshes(NULL)
, mMetaData(NULL) {
// empty
}
aiNode::aiNode(const std::string& name)
: mName(name)
, mParent(nullptr)
, mParent(NULL)
, mNumChildren(0)
, mChildren(nullptr)
, mChildren(NULL)
, mNumMeshes(0)
, mMeshes(nullptr)
, mMetaData(nullptr) {
, mMeshes(NULL)
, mMetaData(NULL) {
// empty
}
@ -68,7 +68,7 @@ aiNode::aiNode(const std::string& name)
aiNode::~aiNode() {
// delete all children recursively
// to make sure we won't crash if the data is invalid ...
if (mNumChildren && mChildren)
if (mChildren && mNumChildren)
{
for (unsigned int a = 0; a < mNumChildren; a++)
delete mChildren[a];