diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-11 17:09:30 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-11 17:09:30 +0300 |
commit | aef4519c8aba3b9c7c3037b532f72dceb0be9092 (patch) | |
tree | f2d92a2ff90bb842d959a5fc91f5fb445e0f4c08 /source/blender/editors/space_view3d/view3d_select.c | |
parent | 6f8c838b78c24fb561f6128b78e1d711b250615d (diff) |
Renaming: sl > scene_layer
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index e22e89dff12..c53efd02b92 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -110,7 +110,7 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc) memset(vc, 0, sizeof(ViewContext)); vc->ar = CTX_wm_region(C); vc->scene = CTX_data_scene(C); - vc->sl = CTX_data_scene_layer(C); + vc->scene_layer = CTX_data_scene_layer(C); vc->v3d = CTX_wm_view3d(C); vc->win = CTX_wm_window(C); vc->rv3d = CTX_wm_region_view3d(C); @@ -390,9 +390,9 @@ static void do_lasso_select_objects(ViewContext *vc, const int mcords[][2], cons Base *base; if (extend == false && select) - object_deselect_all_visible(vc->sl); + object_deselect_all_visible(vc->scene_layer); - for (base = vc->sl->object_bases.first; base; base = base->next) { + for (base = vc->scene_layer->object_bases.first; base; base = base->next) { if (BASE_SELECTABLE_NEW(base)) { /* use this to avoid un-needed lasso lookups */ if (ED_view3d_project_base(vc->ar, base) == V3D_PROJ_RET_OK) { if (BLI_lasso_is_point_inside(mcords, moves, base->sx, base->sy, IS_CLIPPED)) { @@ -1264,7 +1264,7 @@ finally: static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, Base *startbase, bool has_bones, bool do_nearest) { - SceneLayer *sl = vc->sl; + SceneLayer *sl = vc->scene_layer; Base *base, *basact = NULL; int a; @@ -1359,7 +1359,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const int mval[2]) if (hits > 0) { const bool has_bones = selectbuffer_has_bones(buffer, hits); - basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.sl->object_bases.first, has_bones, do_nearest); + basact = mouse_select_eval_buffer(&vc, buffer, hits, vc.scene_layer->object_bases.first, has_bones, do_nearest); } return basact; @@ -2019,7 +2019,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b CTX_DATA_END; } else { - object_deselect_all_visible(vc->sl); + object_deselect_all_visible(vc->scene_layer); } } @@ -2042,7 +2042,7 @@ static int do_object_pose_box_select(bContext *C, ViewContext *vc, rcti *rect, b Base *base; col = vbuffer + 3; - for (base = vc->sl->object_bases.first; base && hits; base = base->next) { + for (base = vc->scene_layer->object_bases.first; base && hits; base = base->next) { if (BASE_SELECTABLE_NEW(base)) { while (base->selcol == (*col & 0xFFFF)) { /* we got an object */ if (*col & 0xFFFF0000) { /* we got a bone */ @@ -2774,7 +2774,7 @@ static void obedit_circle_select(ViewContext *vc, const bool select, const int m static bool object_circle_select(ViewContext *vc, const bool select, const int mval[2], float rad) { - SceneLayer *sl = vc->sl; + SceneLayer *sl = vc->scene_layer; const float radius_squared = rad * rad; const float mval_fl[2] = {mval[0], mval[1]}; bool changed = false; |