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/armature | |
parent | 222a941a2bbd71dcaa1012cdea959954ca065c6a (diff) | |
parent | ecab7bef6989752ff1a8c5fd1eab7b5ab159ed46 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_select.c | 4 | ||||
-rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index f178ad640b6..397691a409b 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -174,7 +174,7 @@ void *get_nearest_bone(bContext *C, const int xy[2], bool findunsel) short hits; CTX_data_eval_ctx(C, &eval_ctx); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); // rect.xmin = ... mouseco! rect.xmin = rect.xmax = xy[0]; @@ -491,7 +491,7 @@ bool ED_armature_select_pick(bContext *C, const int mval[2], bool extend, bool d int selmask; CTX_data_eval_ctx(C, &eval_ctx); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); if (BIF_sk_selectStroke(C, mval, extend)) { return true; diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index f17a83dec8f..f01eed21996 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -1932,7 +1932,7 @@ static bool sk_selectStroke(bContext *C, SK_Sketch *sketch, const int mval[2], c short hits; CTX_data_eval_ctx(C, &eval_ctx); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); BLI_rcti_init_pt_radius(&rect, mval, 5); |