[Bf-blender-cvs] [4badf677392] master: Fix T51629: Select w/ object lock fails

Campbell Barton noreply at git.blender.org
Fri May 26 08:12:22 CEST 2017


Commit: 4badf67739227da702598ccd18a4840f7d7d910b
Author: Campbell Barton
Date:   Fri May 26 16:11:32 2017 +1000
Branches: master
https://developer.blender.org/rB4badf67739227da702598ccd18a4840f7d7d910b

Fix T51629: Select w/ object lock fails

Regression in 195d0fba

===================================================================

M	source/blender/editors/space_view3d/view3d_view.c

===================================================================

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;




More information about the Bf-blender-cvs mailing list