From 73fab5bb3f06eeea3e0d43e4e0dc8df68e79daf8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 May 2016 15:21:53 +1000 Subject: Fix crash introduced w/ snap refactor Create snapping context when in the 3d view, transforming pose bones and grease-pencil crashed. --- source/blender/editors/transform/transform_snap.c | 26 +++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index b9093281e87..bde140a01f0 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -596,20 +596,18 @@ static void initSnappingMode(TransInfo *t) t->tsnap.mode = SCE_SNAP_MODE_INCREMENT; } - if (t->flag & (T_OBJECT | T_EDIT)) { - if (t->spacetype == SPACE_VIEW3D) { - if (t->tsnap.object_context == NULL) { - t->tsnap.object_context = ED_transform_snap_object_context_create_view3d( - G.main, t->scene, SNAP_OBJECT_USE_CACHE, - t->ar, t->view); - - ED_transform_snap_object_context_set_editmesh_callbacks( - t->tsnap.object_context, - (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, - bm_edge_is_snap_target, - bm_face_is_snap_target, - SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); - } + if (t->spacetype == SPACE_VIEW3D) { + if (t->tsnap.object_context == NULL) { + t->tsnap.object_context = ED_transform_snap_object_context_create_view3d( + G.main, t->scene, SNAP_OBJECT_USE_CACHE, + t->ar, t->view); + + ED_transform_snap_object_context_set_editmesh_callbacks( + t->tsnap.object_context, + (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, + bm_edge_is_snap_target, + bm_face_is_snap_target, + SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); } } } -- cgit v1.2.3