GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.12

Browse Source 
# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/GUI/Dialogs/ColorSelector.cs
This commit is contained in:
Wojtek Figat
2026-03-24 23:41:58 +01:00
parent ce5dd6bc16 e8134803c4
commit f3c957481c
36 changed files with 725 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Profiler/ProfilerMemory.cpp
View File

@@ -263,6 +263,7 @@ void InitProfilerMemory(const Char* cmdLine, int32 stage)
INIT_PARENT(Level, LevelTerrain);
INIT_PARENT(Navigation, NavigationMesh);
INIT_PARENT(Navigation, NavigationBuilding);
INIT_PARENT(Physics, PhysicsCloth);
INIT_PARENT(Scripting, ScriptingVisual);
INIT_PARENT(Scripting, ScriptingCSharp);
INIT_PARENT(ScriptingCSharp, ScriptingCSharpGCCommitted);