[Bf-blender-cvs] [e50b4d7de43] master: UI: Incorrect Cursor Used in Split Area Operator

Harley Acheson noreply at git.blender.org
Thu Oct 24 18:19:37 CEST 2019


Commit: e50b4d7de4367a00cbd6b5ec1590852973c7b187
Author: Harley Acheson
Date:   Thu Oct 24 09:17:55 2019 -0700
Branches: master
https://developer.blender.org/rBe50b4d7de4367a00cbd6b5ec1590852973c7b187

UI: Incorrect Cursor Used in Split Area Operator

Incorrect cursor shown for horizontal split when selected from edge context menu.

Differential Revision: https://developer.blender.org/D6124

Reviewed by Campbell Barton

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/screen/screen_ops.c
M	source/tools

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 6a6b84fd505..1127ff3143e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 6a6b84fd50538a65276c729b5d396be615bc79f2
+Subproject commit 1127ff3143efdda5152a6b1f5986d567d5161957
diff --git a/release/scripts/addons b/release/scripts/addons
index 46b1ada7f5f..d92964b0e50 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 46b1ada7f5f2d396f712e9a1376922ca89475486
+Subproject commit d92964b0e5035e4532b539137e937591eba88b26
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index b5e801446c8..786f4704328 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit b5e801446c820e7f5725e2e09f8c2a12a4449f45
+Subproject commit 786f4704328507a95b6c1d254bf4cf400a5e8f0c
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index cc1f53eabde..c5e7d578e71 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -2119,7 +2119,7 @@ static void area_split_preview_update_cursor(bContext *C, wmOperator *op)
 {
   wmWindow *win = CTX_wm_window(C);
   int dir = RNA_enum_get(op->ptr, "direction");
-  WM_cursor_set(win, (dir == 'n' || dir == 's') ? WM_CURSOR_H_SPLIT : WM_CURSOR_V_SPLIT);
+  WM_cursor_set(win, dir == 'h' ? WM_CURSOR_H_SPLIT : WM_CURSOR_V_SPLIT);
 }
 
 /* UI callback, adds new handler */
diff --git a/source/tools b/source/tools
index 8598818108d..ce943dad8a2 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 8598818108ddaf35e30d2a2dbd408ad371e41eb5
+Subproject commit ce943dad8a21b4784e2dcef12d8f893473cddb7f



More information about the Bf-blender-cvs mailing list