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

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

Browse Source
This commit is contained in:
Wojtek Figat
2025-09-09 22:58:34 +02:00
parent 64c62f269c 8921cf5156
commit 8482f93a0f
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Physics/Actors/IPhysicsDebug.h
View File

@@ -12,7 +12,7 @@ public:
{ {
} }
}; };
#define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) #define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) override
#else #else
#define ImplementPhysicsDebug #define ImplementPhysicsDebug
#endif #endif

5
Source/Engine/Platform/Mac/MacPlatform.cpp
View File

@@ -258,7 +258,10 @@ bool MacPlatform::Init()
// Get device id // Get device id
{ {
io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/"); #if MAC_OS_X_VERSION_MAX_ALLOWED < 120000
#define kIOMainPortDefault kIOMasterPortDefault
#endif
io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMainPortDefault, "IOService:/");
CFStringRef deviceUuid = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0); CFStringRef deviceUuid = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
IOObjectRelease(ioRegistryRoot); IOObjectRelease(ioRegistryRoot);
String uuidStr = AppleUtils::ToString(deviceUuid); String uuidStr = AppleUtils::ToString(deviceUuid);

6
Source/Engine/UI/GUI/Common/Label.cs
View File

@@ -344,5 +344,11 @@ namespace FlaxEngine.GUI
base.PerformLayoutBeforeChildren(); base.PerformLayoutBeforeChildren();
} }
/// <inheritdoc />
public override string ToString()
{
return $"{GetType()}, '{ConvertedText()}'";
}
} }
} }