Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash introduced w/ snap refactor

Browse Source 
Create snapping context when in the 3d view,
transforming pose bones and grease-pencil crashed.
This commit is contained in:
Campbell Barton
2016-05-09 15:21:53 +10:00
parent dc4c3ce592
commit 73fab5bb3f
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/transform/transform_snap.c
View File

@@ -596,20 +596,18 @@ static void initSnappingMode(TransInfo *t)
t->tsnap.mode = SCE_SNAP_MODE_INCREMENT; t->tsnap.mode = SCE_SNAP_MODE_INCREMENT;
} }
if (t->flag & (T_OBJECT | T_EDIT)) { if (t->spacetype == SPACE_VIEW3D) {
if (t->spacetype == SPACE_VIEW3D) { if (t->tsnap.object_context == NULL) {
if (t->tsnap.object_context == NULL) { t->tsnap.object_context = ED_transform_snap_object_context_create_view3d(
t->tsnap.object_context = ED_transform_snap_object_context_create_view3d( G.main, t->scene, SNAP_OBJECT_USE_CACHE,
G.main, t->scene, SNAP_OBJECT_USE_CACHE, t->ar, t->view);
t->ar, t->view);
ED_transform_snap_object_context_set_editmesh_callbacks( ED_transform_snap_object_context_set_editmesh_callbacks(
t->tsnap.object_context, t->tsnap.object_context,
(bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled, (bool (*)(BMVert *, void *))BM_elem_cb_check_hflag_disabled,
bm_edge_is_snap_target, bm_edge_is_snap_target,
bm_face_is_snap_target, bm_face_is_snap_target,
SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN))); SET_UINT_IN_POINTER((BM_ELEM_SELECT | BM_ELEM_HIDDEN)));
}
} }
} }
} }