[Bf-blender-cvs] [8b63c6241db] master: Fix snap3d crash (missing NULL check)

Campbell Barton noreply at git.blender.org
Tue Jun 2 02:54:33 CEST 2020


Commit: 8b63c6241db928de3729e560d8c723a4849924b4
Author: Campbell Barton
Date:   Tue Jun 2 10:49:24 2020 +1000
Branches: master
https://developer.blender.org/rB8b63c6241db928de3729e560d8c723a4849924b4

Fix snap3d crash (missing NULL check)

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

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 1ed02bd6cb9..a3921791427 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.c
@@ -413,7 +413,7 @@ static int gizmo_snap_test_select(bContext *C, wmGizmo *gz, const int mval[2])
     RNA_enum_value_from_id(gizmo_snap->keymap->modal_items, "SNAP_ON", &gizmo_snap->snap_on);
   }
 
-  const bool invert = invert_snap(gz, wm, wm->winactive->eventstate);
+  const bool invert = wm->winactive ? invert_snap(gz, wm, wm->winactive->eventstate) : false;
   if (gizmo_snap->invert_snap == invert && gizmo_snap->mval[0] == mval[0] &&
       gizmo_snap->mval[1] == mval[1]) {
     /* Performance, do not update. */



More information about the Bf-blender-cvs mailing list