diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:52:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:54:52 +0300 |
commit | 9342f55d12f87dbc72e6953e0bc6c2564e57465f (patch) | |
tree | ef3d3baa82c2bbf4badd6f11592237df76c8744e /source/blender/editors/mesh/meshtools.c | |
parent | 222a941a2bbd71dcaa1012cdea959954ca065c6a (diff) | |
parent | ecab7bef6989752ff1a8c5fd1eab7b5ab159ed46 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 4daa4a23470..aebfd46a554 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -1102,7 +1102,7 @@ bool ED_mesh_pick_face(bContext *C, Object *ob, const int mval[2], unsigned int return false; CTX_data_eval_ctx(C, &eval_ctx); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); if (size) { /* sample rect to increase chances of selecting, so that when clicking @@ -1273,7 +1273,7 @@ bool ED_mesh_pick_vert(bContext *C, Object *ob, const int mval[2], unsigned int if (!me || me->totvert == 0) return false; - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); if (use_zbuf) { if (size > 0) { |