Merge pull request #81442 from bruvzg/gl_mt

[macOS, 3.x] Disable live resize in multithreaded rendering mode.
This commit is contained in:
Rémi Verschelde 2023-09-18 15:03:56 +02:00 committed by GitHub
commit 86dee6ee13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -478,7 +478,7 @@ static NSCursor *cursorFromSelector(SEL selector, SEL fallback = nil) {
@implementation GodotContentView @implementation GodotContentView
- (void)drawRect:(NSRect)dirtyRect { - (void)drawRect:(NSRect)dirtyRect {
if (OS_OSX::singleton->get_main_loop() && OS_OSX::singleton->is_resizing) { if (OS_OSX::singleton->get_main_loop() && (OS_OSX::singleton->get_render_thread_mode() != OS::RENDER_SEPARATE_THREAD) && OS_OSX::singleton->is_resizing) {
Main::force_redraw(); Main::force_redraw();
if (!Main::is_iterating()) { // Avoid cyclic loop. if (!Main::is_iterating()) { // Avoid cyclic loop.
Main::iteration(); Main::iteration();