[Bf-blender-cvs] [73fab5b] master: Fix crash introduced w/ snap refactor

Campbell Barton noreply at git.blender.org
Mon May 9 07:41:10 CEST 2016


Commit: 73fab5bb3f06eeea3e0d43e4e0dc8df68e79daf8
Author: Campbell Barton
Date:   Mon May 9 15:21:53 2016 +1000
Branches: master
https://developer.blender.org/rB73fab5bb3f06eeea3e0d43e4e0dc8df68e79daf8

Fix crash introduced w/ snap refactor

Create snapping context when in the 3d view,
transforming pose bones and grease-pencil crashed.

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

M	source/blender/editors/transform/transform_snap.c

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

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index b909328..bde140a 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)));
 		}
 	}
 }




More information about the Bf-blender-cvs mailing list