TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-25 07:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
This commit is contained in:
Jeff Hutchinson 2021-09-01 22:26:23 -04:00
commit 17231ca9fb
51 changed files with 736 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/core/util/str.cpp
View file

@ -284,8 +284,8 @@ class String::StringData : protected StringDataImpl
delete [] mUTF16;
}
void* operator new(size_t size, U32 len);
void* operator new( size_t size, U32 len, DataChunker& chunker );
void* TORQUE_NOINLINE operator new(size_t size, U32 len);
void* TORQUE_NOINLINE operator new( size_t size, U32 len, DataChunker& chunker );
void operator delete(void *);
bool isShared() const