diff --git a/Source/Editor/Scripting/TypeUtils.cs b/Source/Editor/Scripting/TypeUtils.cs index 5d91f7c6a..7ed8db187 100644 --- a/Source/Editor/Scripting/TypeUtils.cs +++ b/Source/Editor/Scripting/TypeUtils.cs @@ -41,6 +41,8 @@ namespace FlaxEngine.Utilities public static string GetTypeDisplayName(this Type type) { // Special display for in-built basic types + if (type == null) + return "Null"; if (type == typeof(bool)) return "Bool"; if (type == typeof(float)) diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp index a33cd8194..00050dc96 100644 --- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp +++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp @@ -77,7 +77,7 @@ GPUDevice* GPUDeviceDX12::Create() #endif #ifdef __ID3D12DeviceRemovedExtendedDataSettings_FWD_DEFINED__ ComPtr dredSettings; - VALIDATE_DIRECTX_CALL(D3D12GetDebugInterface(IID_PPV_ARGS(&dredSettings))); + D3D12GetDebugInterface(IID_PPV_ARGS(&dredSettings)); if (dredSettings) { // Turn on AutoBreadcrumbs and Page Fault reporting