Merge remote-tracking branch 'origin/master' into sdl_platform
# Conflicts: # Source/Editor/Viewport/MainEditorGizmoViewport.cs
This commit is contained in:
@@ -549,7 +549,6 @@ void WindowsPlatform::ReleaseMutex()
|
||||
}
|
||||
}
|
||||
|
||||
PRAGMA_DISABLE_OPTIMIZATION;
|
||||
void CheckInstructionSet()
|
||||
{
|
||||
#if PLATFORM_ARCH_X86 || PLATFORM_ARCH_X64
|
||||
|
||||
Reference in New Issue
Block a user