diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-25 21:39:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-25 21:59:18 +0300 |
| commit | d8e83516e209cbb7c040211da558d7fff9ecc5be (patch) | |
| tree | d332524c550188fb9034f3a7c182224427bea01d /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 041a50291b73b727fdf8bc3192de2917e8563ce0 (diff) | |
Draw Manager: support for selection using engines
Needed to remove old draw code entirely.
Object mode selection support, pose and armature still need to be added.
Enabled when 'use_modern_viewport' is set.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 4cfb30a9dd7..9fa616cee01 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -62,6 +62,8 @@ #include "ED_screen.h" #include "ED_armature.h" +#include "DRW_engine.h" + #ifdef WITH_GAMEENGINE # include "BLI_listbase.h" @@ -1180,7 +1182,12 @@ int view3d_opengl_select( GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0); - ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); + if (IS_VIEWPORT_LEGACY(vc->v3d)) { + ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); + } + else { + DRW_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest, &rect); + } hits = GPU_select_end(); @@ -1188,7 +1195,12 @@ int view3d_opengl_select( if (do_passes) { GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits); - ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); + if (IS_VIEWPORT_LEGACY(vc->v3d)) { + ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); + } + else { + DRW_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest, &rect); + } GPU_select_end(); } |