[Bf-blender-cvs] [88b6dd1392d] master: Fix missing cursor changes with "Lock Object Modes" disabled
Julian Eisel
noreply at git.blender.org
Thu Sep 3 21:08:12 CEST 2020
Commit: 88b6dd1392dfa5f2fc3047bc0ec597b2478f6174
Author: Julian Eisel
Date: Thu Sep 3 21:00:00 2020 +0200
Branches: master
https://developer.blender.org/rB88b6dd1392dfa5f2fc3047bc0ec597b2478f6174
Fix missing cursor changes with "Lock Object Modes" disabled
Changing the active object would change the mode, but the necessary
toolsystem update to change the cursor was not run.
Steps to recreate were:
* Duplicate default cube
* Enter sculpt mode with one of the cubes
* Disable Edit > Lock Object Modes
* Select back-and-forth between the objects
Same would happen with other modes.
===================================================================
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 03c1ecae317..7562bf6f75c 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -76,6 +76,7 @@
#include "DEG_depsgraph.h"
#include "WM_api.h"
+#include "WM_toolsystem.h"
#include "WM_types.h"
#include "RNA_access.h"
@@ -2293,6 +2294,9 @@ static bool ed_object_select_pick(bContext *C,
if ((oldbasact != basact) && (is_obedit == false)) {
ED_object_base_activate(C, basact); /* adds notifier */
+ if ((scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) == 0) {
+ WM_toolsystem_update_from_context_view3d(C);
+ }
}
/* Set special modes for grease pencil
More information about the Bf-blender-cvs
mailing list