diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:30:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:30:24 +0300 |
commit | ecab7bef6989752ff1a8c5fd1eab7b5ab159ed46 (patch) | |
tree | ae7ef72a16e58ee9a1cb3f50c363fc24bcaf1fd5 /source/blender/editors/space_view3d | |
parent | 28f86bf117e9d9d10089ef758a5ec4ade65084c6 (diff) |
Cleanup: Rename view3d context set function
Use common prefix so adding related functions share the prefix.
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 35e8046313a..199800df539 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -4468,7 +4468,7 @@ static int view3d_clipping_exec(bContext *C, wmOperator *op) /* note; otherwise opengl won't work */ view3d_operator_needs_opengl(C); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); view3d_get_transformation(vc.ar, vc.rv3d, NULL, &mats); /* NULL because we don't want it in object space */ ED_view3d_clipping_calc(rv3d->clipbb, rv3d->clip, &mats, &rect); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index e6b93f634dd..1cdbd4da1c4 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -104,7 +104,7 @@ float ED_view3d_select_dist_px(void) } /* TODO: should return whether there is valid context to continue */ -void view3d_set_viewcontext(bContext *C, ViewContext *vc) +void ED_view3d_viewcontext_init(bContext *C, ViewContext *vc) { memset(vc, 0, sizeof(ViewContext)); vc->ar = CTX_wm_region(C); @@ -884,7 +884,7 @@ static int view3d_lasso_select_exec(bContext *C, wmOperator *op) view3d_operator_needs_opengl(C); /* setup view context for argument to callbacks */ - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); extend = RNA_boolean_get(op->ptr, "extend"); select = !RNA_boolean_get(op->ptr, "deselect"); @@ -1329,7 +1329,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const int mval[2]) /* setup view context for argument to callbacks */ view3d_operator_needs_opengl(C); - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); hits = mixed_bones_object_selectbuffer(&vc, buffer, mval, false, false, &do_nearest); @@ -1378,7 +1378,7 @@ static bool ed_object_select_pick( /* setup view context for argument to callbacks */ - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); is_obedit = (vc.obedit != NULL); if (object) { @@ -2081,7 +2081,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) view3d_operator_needs_opengl(C); /* setup view context for argument to callbacks */ - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); select = !RNA_boolean_get(op->ptr, "deselect"); extend = RNA_boolean_get(op->ptr, "extend"); @@ -2779,7 +2779,7 @@ static bool object_circle_select(ViewContext *vc, const bool select, const int m static int view3d_circle_select_exec(bContext *C, wmOperator *op) { ViewContext vc; - view3d_set_viewcontext(C, &vc); + ED_view3d_viewcontext_init(C, &vc); Object *obact = vc.obact; Object *obedit = vc.obedit; const int radius = RNA_int_get(op->ptr, "radius"); |