From 1029577a51f43d96056172e4653f92d94fe8f75e Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 22 Jul 2021 21:41:28 +0100 Subject: GHOST/wayland: explicitly delete 'GHOST_SystemWayland' when fallback to X11 --- intern/ghost/intern/GHOST_ISystem.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index 7c12bfe0306..d9fecda22a4 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -60,6 +60,8 @@ GHOST_TSuccess GHOST_ISystem::createSystem() } catch (const std::runtime_error &) { /* fallback to X11. */ + delete m_system; + m_system = nullptr; } if (!m_system) { m_system = new GHOST_SystemX11(); -- cgit v1.2.3 From a2ccd0e495d54240f785ee425a15ba1bd2537e5a Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Sun, 23 May 2021 16:41:29 +0100 Subject: cmake: enable Wayland by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5992993f91..a4e03ef44b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,7 +217,7 @@ if(UNIX AND NOT (APPLE OR HAIKU)) option(WITH_GHOST_X11 "Enable building Blender against X11 for windowing" ON) mark_as_advanced(WITH_GHOST_X11) - option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing (under development)" OFF) + option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing" ON) mark_as_advanced(WITH_GHOST_WAYLAND) endif() -- cgit v1.2.3 From c971c851d38ad52779fa5d75c86bbfb83abf660b Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 22 Jul 2021 21:37:41 +0100 Subject: GHOST/wayland: use Wayland only when 'BLENDER_WAYLAND' is set --- intern/ghost/intern/GHOST_ISystem.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index d9fecda22a4..cb85edb728b 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -57,6 +57,12 @@ GHOST_TSuccess GHOST_ISystem::createSystem() /* Special case, try Wayland, fall back to X11. */ try { m_system = new GHOST_SystemWayland(); + if (!std::getenv("BLENDER_WAYLAND")) { + printf("Connected to a Wayland compositor but Wayland is disabled at "\ + "runtime.\nSet environment variable 'BLENDER_WAYLAND' (e.g. "\ + "BLENDER_WAYLAND= blender) to use Wayland.\n"); + throw std::runtime_error(std::string()); + } } catch (const std::runtime_error &) { /* fallback to X11. */ -- cgit v1.2.3 From aa32121174711acd341d29cd93d35c5560c5eedc Mon Sep 17 00:00:00 2001 From: Christoph Lendenfeld Date: Sat, 24 Jul 2021 21:25:23 +0100 Subject: Fix: Remove automatic hiding of bones when using the pose slider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch addresses the issue raised in T88340. When entering a pose sliding operator bones would automatically get hidden. While technically not a bug it was decided that it is too confusing. Hiding with 'H' is still possible though, just won't happen automatically Reviewed by: Sybren A. Stüvel Differential Revision: https://developer.blender.org/D11883 Ref: D11883 --- source/blender/editors/armature/pose_slide.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index e87d221058c..d267072c2f6 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -1046,10 +1046,9 @@ static int pose_slide_invoke_common(bContext *C, wmOperator *op, const wmEvent * /* Add a modal handler for this operator. */ WM_event_add_modal_handler(C, op); - /* Hide Bone Overlay. */ + /* Save current bone visibility. */ View3D *v3d = pso->area->spacedata.first; pso->overlay_flag = v3d->overlay.flag; - v3d->overlay.flag |= V3D_OVERLAY_HIDE_BONES; return OPERATOR_RUNNING_MODAL; } -- cgit v1.2.3