Commit: 84315368efa263454b85d0944248962ffa2cf479
Author: Campbell Barton
Date: Tue Jun 21 16:03:26 2022 +1000
Branches: master
https://developer.blender.org/rB84315368efa263454b85d0944248962ffa2cf479
Fix error in GHOST_ASSERT under Wayland
===================================================================
M intern/ghost/intern/GHOST_SystemWayland.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp
b/intern/ghost/intern/GHOST_SystemWayland.cpp
index 41b808144f2..5ca85933cc7 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -2596,7 +2596,7 @@ static void cursor_buffer_set(const input_t *input,
wl_buffer *buffer)
/* This is a requirement of WAYLAND, when this isn't the case,
* it causes Blender's window to close intermittently. */
- GHOST_ASSERT((image_size_x % size) == 0 && (image_size_y % size) == 0,
+ GHOST_ASSERT((image_size_x % scale) == 0 && (image_size_y % scale) == 0,
"The size must be a multiple of the scale!");
const int32_t hotspot_x = int32_t(c->wl_image.hotspot_x) / scale;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs