lock view area wasnt working when all bones were de-selected

1 files changed, 17 insertions, 13 deletions

diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index 143d003b986..a6fe0676fd8 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -982,20 +982,24 @@ static void make_editipo(void)
 	/* sets globals, bad stuff but we need these variables in other parts of code */
 	get_status_editipo();
 	
-	if(G.sipo->ipo) {
-
-		if (G.sipo->flag & SIPO_LOCK_VIEW || G.sipo->pin)
-			 rf= &(G.sipo->v2d.cur);
-		else
-			rf= &(G.sipo->ipo->cur);
-		
-		if(rf->xmin<rf->xmax && rf->ymin<rf->ymax) G.v2d->cur= *rf;
-		else ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
-	}
-	else {
-		ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
-	}
 	
+	if (G.sipo->flag & SIPO_LOCK_VIEW) {
+		rf= &(G.v2d->cur); /* view is locked, dont move it, just to sanity check */
+		if(rf->xmin>=rf->xmax || rf->ymin>=rf->ymax) ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
+	} else {
+		if(G.sipo->ipo) {
+			if (G.sipo->pin)
+				rf= &(G.sipo->v2d.cur);
+			else
+				rf= &(G.sipo->ipo->cur);
+			
+			if(rf->xmin<rf->xmax && rf->ymin<rf->ymax) G.v2d->cur= *rf;
+			else ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
+		}
+		else {
+			ipo_default_v2d_cur(G.sipo->blocktype, &G.v2d->cur);
+		}
+	}
 	view2d_do_locks(curarea, V2D_LOCK_COPY);
 }