[Bf-blender-cvs] [68f355fbee9] blender-v2.91-release: Fix T83161: Crash when moving ruler endpoints and opening or closing the toolshelf
Germano Cavalcante
noreply at git.blender.org
Wed Jan 13 15:08:45 CET 2021
Commit: 68f355fbee93515f83b060214776e73f775e1f07
Author: Germano Cavalcante
Date: Wed Dec 2 10:27:41 2020 -0300
Branches: blender-v2.91-release
https://developer.blender.org/rB68f355fbee93515f83b060214776e73f775e1f07
Fix T83161: Crash when moving ruler endpoints and opening or closing the toolshelf
`invert_snap` could be called before `snap_gizmo->keymap` was found.
Use the lazy initialization in `invert_snap` then.
===================================================================
M source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
===================================================================
diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
index 24943ab5318..f7caf8e4c6a 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
@@ -78,11 +78,21 @@ typedef struct SnapGizmo3D {
} SnapGizmo3D;
#ifdef USE_SNAP_DETECT_FROM_KEYMAP_HACK
-static bool invert_snap(SnapGizmo3D *snap_gizmo, const wmWindowManager *wm, const wmEvent *event)
+static bool invert_snap(SnapGizmo3D *snap_gizmo, const wmWindowManager *wm)
{
- wmKeyMap *keymap = WM_keymap_active(wm, snap_gizmo->keymap);
+ if (!wm || !wm->winactive) {
+ return false;
+ }
+ if (snap_gizmo->keymap == NULL) {
+ /* Lazy initialization. */
+ snap_gizmo->keymap = WM_modalkeymap_find(wm->defaultconf, "Generic Gizmo Tweak Modal Map");
+ RNA_enum_value_from_id(snap_gizmo->keymap->modal_items, "SNAP_ON", &snap_gizmo->snap_on);
+ }
const int snap_on = snap_gizmo->snap_on;
+
+ wmKeyMap *keymap = WM_keymap_active(wm, snap_gizmo->keymap);
+ const wmEvent *event = wm->winactive->eventstate;
for (wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) {
if (kmi->flag & KMI_INACTIVE) {
continue;
@@ -254,9 +264,7 @@ short ED_gizmotypes_snap_3d_update(wmGizmo *gz,
}
#ifdef USE_SNAP_DETECT_FROM_KEYMAP_HACK
- if (wm && wm->winactive) {
- snap_gizmo->invert_snap = invert_snap(snap_gizmo, wm, wm->winactive->eventstate);
- }
+ snap_gizmo->invert_snap = invert_snap(snap_gizmo, wm);
if (snap_gizmo->use_snap_override == -1) {
const ToolSettings *ts = scene->toolsettings;
@@ -413,13 +421,7 @@ static int snap_gizmo_test_select(bContext *C, wmGizmo *gz, const int mval[2])
#ifdef USE_SNAP_DETECT_FROM_KEYMAP_HACK
wmWindowManager *wm = CTX_wm_manager(C);
- if (snap_gizmo->keymap == NULL) {
- snap_gizmo->keymap = WM_modalkeymap_find(wm->defaultconf, "Generic Gizmo Tweak Modal Map");
- RNA_enum_value_from_id(snap_gizmo->keymap->modal_items, "SNAP_ON", &snap_gizmo->snap_on);
- }
-
- const bool invert = wm->winactive ? invert_snap(snap_gizmo, wm, wm->winactive->eventstate) :
- false;
+ const bool invert = invert_snap(snap_gizmo, wm);
if (snap_gizmo->invert_snap == invert && snap_gizmo->mval[0] == mval[0] &&
snap_gizmo->mval[1] == mval[1]) {
/* Performance, do not update. */
More information about the Bf-blender-cvs
mailing list