blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-16 12:33:46 +11:00
parent 5e203c4f4b d1a5f24e73
commit e3ddfedbb6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_WindowWayland.cpp
View File

@ -913,13 +913,13 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
setSwapInterval(0);
}
#ifdef USE_EVENT_BACKGROUND_THREAD
GHOST_TSuccess GHOST_WindowWayland::swapBuffers()
{
#ifdef USE_EVENT_BACKGROUND_THREAD
GHOST_ASSERT(system_->main_thread_id == std::this_thread::get_id(), "Only from main thread!");
#endif
return GHOST_Window::swapBuffers();
}
#endif /* USE_EVENT_BACKGROUND_THREAD */
GHOST_TSuccess GHOST_WindowWayland::setWindowCursorGrab(GHOST_TGrabCursorMode mode)
{

4
intern/ghost/intern/GHOST_WindowWayland.h
View File

@ -78,7 +78,9 @@ class GHOST_WindowWayland : public GHOST_Window {
/* Ghost API */
GHOST_TSuccess swapBuffers() override;
#ifdef USE_EVENT_BACKGROUND_THREAD
GHOST_TSuccess swapBuffers() override; /* Only for assertion. */
#endif
uint16_t getDPIHint() override;