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(+) (limited to 'intern') 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