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

Source/Engine/Physics/Actors/IPhysicsDebug.h

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

Source/Engine/Platform/Mac/MacPlatform.cpp

@@ -258,7 +258,10 @@ bool MacPlatform::Init()
 
     // 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);
         IOObjectRelease(ioRegistryRoot);
         String uuidStr = AppleUtils::ToString(deviceUuid);

Source/Engine/UI/GUI/Common/Label.cs

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