From d17a4af72e9a7ec39ec9bf826056d20da9284da3 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 7 Jul 2021 10:14:51 +0200 Subject: [PATCH] Tweaks --- Source/Engine/Content/Content.h | 3 ++- Source/Engine/Profiler/ProfilingTools.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Content/Content.h b/Source/Engine/Content/Content.h index 98c4e2c8c..418993595 100644 --- a/Source/Engine/Content/Content.h +++ b/Source/Engine/Content/Content.h @@ -16,11 +16,12 @@ class AssetsCache; API_STRUCT() struct FLAXENGINE_API ContentStats { DECLARE_SCRIPTING_TYPE_MINIMAL(ContentStats); + // Amount of asset objects in memory. API_FIELD() int32 AssetsCount = 0; // Amount of loaded assets. API_FIELD() int32 LoadedAssetsCount = 0; - // Amount of loading assets. + // Amount of loading assets. Zero if all assets are loaded in. API_FIELD() int32 LoadingAssetsCount = 0; // Amount of virtual assets (don't have representation in file). API_FIELD() int32 VirtualAssetsCount = 0; diff --git a/Source/Engine/Profiler/ProfilingTools.cpp b/Source/Engine/Profiler/ProfilingTools.cpp index daedf2a61..1bf03b9ff 100644 --- a/Source/Engine/Profiler/ProfilingTools.cpp +++ b/Source/Engine/Profiler/ProfilingTools.cpp @@ -57,7 +57,8 @@ void ProfilingToolsService::Update() for (int32 i = 0; i < threads.Count(); i++) { auto t = threads[i]; - + if (t == nullptr) + continue; ProfilingTools::ThreadStats* pt = nullptr; for (auto& e : ProfilingTools::EventsCPU) {