[Bf-blender-cvs] [bb36037] master: Fix T38472: allow orbiting locked view when they are already 'user'.

Campbell Barton noreply at git.blender.org
Tue Feb 4 09:46:54 CET 2014


Commit: bb36037c1561c3c3d7a61fac885b01408201fe0e
Author: Campbell Barton
Date:   Tue Feb 4 19:45:22 2014 +1100
https://developer.blender.org/rBbb36037c1561c3c3d7a61fac885b01408201fe0e

Fix T38472: allow orbiting locked view when they are already 'user'.

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 7d37326..cf96686 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -985,7 +985,8 @@ static int viewrotate_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 	viewops_data_create(C, op, event);
 	vod = op->customdata;
 
-	if (vod->rv3d->viewlock) { /* poll should check but in some cases fails, see poll func for details */
+	/* poll should check but in some cases fails, see poll func for details */
+	if (vod->rv3d->viewlock && RV3D_VIEW_IS_AXIS(vod->rv3d->view)) {
 		viewops_data_free(C, op);
 		return OPERATOR_PASS_THROUGH;
 	}




More information about the Bf-blender-cvs mailing list