diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 09:11:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-26 09:11:56 +0300 |
| commit | 4badf67739227da702598ccd18a4840f7d7d910b (patch) | |
| tree | 2a69ab3883d5127ec2b6d2733e6529c9a1cb77b6 /source/blender | |
| parent | 9158d162198549d8475bca4299df6f870b82c49d (diff) | |
Fix T51629: Select w/ object lock fails
Regression in 195d0fba
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 88315927b42..eda4d51e7e8 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1172,7 +1172,9 @@ int view3d_opengl_select( G.f |= G_PICKSEL; - ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, &rect); + /* Important we use the 'viewmat' and don't re-calculate since + * the object & bone view locking takes 'rect' into account, see: T51629. */ + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, vc->rv3d->viewmat, NULL, &rect); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = true; @@ -1198,7 +1200,7 @@ int view3d_opengl_select( } G.f &= ~G_PICKSEL; - ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, NULL, NULL, NULL); + ED_view3d_draw_setup_view(vc->win, scene, ar, v3d, vc->rv3d->viewmat, NULL, NULL); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = 0; |