griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T51629: Select w/ object lock fails

Browse Source 
Regression in 195d0fba
This commit is contained in:
Campbell Barton
2017-05-26 16:11:32 +10:00
parent 9158d16219
commit 4badf67739
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_view3d/view3d_view.c
View File

@@ -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;