diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-25 14:50:09 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-25 14:50:09 +0300 |
| commit | fd7e8634fac1a09c850e20992a0576fbf1d9c367 (patch) | |
| tree | 06217407e10e2339d4d013d03d77d0a0ec700b74 | |
| parent | f2fb5b6ff21812ab0d956210d9ab522506cd71e8 (diff) | |
| parent | aa32121174711acd341d29cd93d35c5560c5eedc (diff) | |
Merge branch 'master' into node-group-single-socket-nodesnode-group-single-socket-nodes
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_ISystem.cpp | 8 | ||||
| -rw-r--r-- | source/blender/editors/armature/pose_slide.c | 3 |
3 files changed, 10 insertions, 3 deletions
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() diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index 7c12bfe0306..cb85edb728b 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -57,9 +57,17 @@ 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. */ + delete m_system; + m_system = nullptr; } if (!m_system) { m_system = new GHOST_SystemX11(); 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; } |