TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-17 02:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1452 from marauder2k9-torque/MEMORY-MANAGER-REFACTOR

Browse source 
Memory Manager Refactor
This commit is contained in:
Brian Roberts 2025-05-12 15:31:06 -05:00 • committed by GitHub
commit 6cda97867c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 581 additions and 1811 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Engine/source/ts/assimp/assimpAppMaterial.cpp
View file

@ -29,12 +29,23 @@
#include "ts/tsMaterialList.h"
#include "core/stream/fileStream.h"
#if !defined(TORQUE_DISABLE_MEMORY_MANAGER)
#ifdef new
#undef new
#endif
#endif
// assimp include files.
#include <assimp/cimport.h>
#include <assimp/scene.h>
#include <assimp/postprocess.h>
#include <assimp/types.h>
#if !defined(TORQUE_DISABLE_MEMORY_MANAGER)
# define _new new(__FILE__, __LINE__)
# define new _new
#endif
U32 AssimpAppMaterial::sDefaultMatNumber = 0;
String AppMaterial::cleanString(const String& str)