diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 17:54:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-10 17:54:57 +0300 |
| commit | 62aa925c11d00df0366ef17bf2baa165f73ab19c (patch) | |
| tree | b7d0dfe7cb2a3d7988c3a38abd3dfcd2530b4a8a /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 195d0fbae373c5fa4dd18245d830542c095da1e0 (diff) | |
Fix T51354: Final take on multi-view (single view) issues
We now handle selection and transform manipulators
(kudos to Julian Eisel to help hunting down the latter).
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index fe8274064e5..88315927b42 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -449,7 +449,7 @@ void ED_view3d_smooth_view_force_finish( /* force update of view matrix so tools that run immediately after * can use them without redrawing first */ Scene *scene = CTX_data_scene(C); - ED_view3d_update_viewmat(scene, v3d, ar, NULL, NULL); + ED_view3d_update_viewmat(scene, v3d, ar, NULL, NULL, NULL); } } @@ -1172,9 +1172,8 @@ int view3d_opengl_select( G.f |= G_PICKSEL; - view3d_winmatrix_set(ar, v3d, &rect); - mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); - + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, &rect); + if (v3d->drawtype > OB_WIRE) { v3d->zbuf = true; glEnable(GL_DEPTH_TEST); @@ -1199,8 +1198,7 @@ int view3d_opengl_select( } G.f &= ~G_PICKSEL; - view3d_winmatrix_set(ar, v3d, NULL); - mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, NULL); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = 0; |