From 190665bbbfad0c17f5f8c373728732d977418d07 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Tue, 10 Jan 2023 20:52:34 +0800 Subject: [PATCH] Changed function signature to take in rig node pointer reference instead of r value ptr --- SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp | 4 +++- SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp index bfb97fda..698e8d5d 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp @@ -153,7 +153,7 @@ namespace SHADE } } - void SHModelLoader::ReadRigTree(FileReference file, SHRigDataHeader const& header, SHRigNode* root) + void SHModelLoader::ReadRigTree(FileReference file, SHRigDataHeader const& header, SHRigNode*& root) { // Read All nodes into one contiguous data block struct NodeTemp @@ -193,6 +193,8 @@ namespace SHADE nodeQueue.emplace(depthPtr++, depthTempPtr++); } } + + delete[] dst; } void SHModelLoader::ReadMeshData(FileReference file, std::vector const& headers, diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.h b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.h index 05e58b6c..93db8534 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.h +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.h @@ -24,7 +24,7 @@ namespace SHADE void ReadRigHeader(FileReference file, SHRigDataHeader& header); void ReadRigData(FileReference file, SHRigDataHeader const& header, std::vector& data); - void ReadRigTree(FileReference file, SHRigDataHeader const& header, SHRigNode* root); + void ReadRigTree(FileReference file, SHRigDataHeader const& header, SHRigNode*& root); void ReadMeshData(FileReference file, std::vector const& headers, std::vector& meshes); void ReadAnimData(FileReference file, std::vector const& headers, std::vector& anims);