[Bf-blender-cvs] [6ba4db2] master: Fix T41175: Quad View - Properties Region - Clip Tickable option bug?

[Bastien Montagne]

Commit: 6ba4db29062a1d3aaa6e18de776a1fd761a1dcb0
Author: Bastien Montagne
Date:   Mon Aug 4 14:27:18 2014 +0200
Branches: master
https://developer.blender.org/rB6ba4db29062a1d3aaa6e18de776a1fd761a1dcb0

Fix T41175: Quad View - Properties Region - Clip Tickable option bug?

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

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 1d3371a..4ca9eea 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -465,11 +465,13 @@ void ED_view3d_quadview_update(ScrArea *sa, ARegion *ar, bool do_clip)
 	 * properties are always being edited, weak */
 	viewlock = rv3d->viewlock;
 
-	if ((viewlock & RV3D_LOCKED) == 0)
+	if ((viewlock & RV3D_LOCKED) == 0) {
+		do_clip = (viewlock & RV3D_BOXCLIP) != 0;
 		viewlock = 0;
-	else if ((viewlock & RV3D_BOXVIEW) == 0) {
-		viewlock &= ~RV3D_BOXCLIP;
+	}
+	else if ((viewlock & RV3D_BOXVIEW) == 0 && (viewlock & RV3D_BOXCLIP) != 0) {
 		do_clip = true;
+		viewlock &= ~RV3D_BOXCLIP;
 	}
 
 	for (; ar; ar = ar->prev) {