Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Wojciech Figat
2026-05-13 22:40:54 +02:00
parent f83488355d 25dd989749
commit 5058bfc296
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
+1 -1
View File
@@ -182,7 +182,7 @@ namespace FlaxEditor.SceneGraph.GUI
_highlights?.Clear();
isThisVisible = true;
}
else if (filterText.Contains(','))
else if (filterText.Contains(':'))
{
var splitFilter = filterText.Split(',');
var hasAllFilters = true;
Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.cpp
+2 -2
View File
@@ -153,10 +153,10 @@ VkCompareOp RenderToolsVulkan::ComparisonFuncToVkCompareOp[9] =
#if GPU_ENABLE_RESOURCE_NAMING
void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const String& name)
void RenderToolsVulkan::SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const StringView& name)
{
#if VK_EXT_debug_utils
auto str = name.ToStringAnsi();
StringAsANSI<> str(name.Get(), name.Length());
SetObjectName(device, objectHandle, objectType, str.Get());
#endif
}
Source/Engine/GraphicsDevice/Vulkan/RenderToolsVulkan.h
+1 -1
View File
@@ -35,7 +35,7 @@ private:
public:
#if GPU_ENABLE_RESOURCE_NAMING
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const String& name);
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const StringView& name);
static void SetObjectName(VkDevice device, uint64 objectHandle, VkObjectType objectType, const char* name);
#endif
Source/ThirdParty/fmt/format.h
Vendored
+1
View File
@@ -37,6 +37,7 @@
#include <stdint.h>
#include <limits>
#include <initializer_list>
#include <iterator>
#include "core.h"