[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14145] trunk/blender/source/blender/src:

[Brecht Van Lommel]

Revision: 14145
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14145
Author:   blendix
Date:     2008-03-16 21:01:52 +0100 (Sun, 16 Mar 2008)

Log Message:
-----------

Fix for bug #6850: after zooming into the curve widget it could
become impossible to zoom out (with clipping enabled).

Modified Paths:
--------------
    trunk/blender/source/blender/src/butspace.c
    trunk/blender/source/blender/src/drawnode.c

Modified: trunk/blender/source/blender/src/butspace.c
===================================================================
--- trunk/blender/source/blender/src/butspace.c	2008-03-16 19:38:04 UTC (rev 14144)
+++ trunk/blender/source/blender/src/butspace.c	2008-03-16 20:01:52 UTC (rev 14145)
@@ -319,6 +319,7 @@
 				d1= cumap->curr.xmin - cumap->clipr.xmin;
 		cumap->curr.xmin-= d1;
 		
+		d1= d;
 		if(cumap->flag & CUMA_DO_CLIP) 
 			if(cumap->curr.xmax+d > cumap->clipr.xmax)
 				d1= -cumap->curr.xmax + cumap->clipr.xmax;
@@ -331,6 +332,7 @@
 				d1= cumap->curr.ymin - cumap->clipr.ymin;
 		cumap->curr.ymin-= d1;
 		
+		d1= d;
 		if(cumap->flag & CUMA_DO_CLIP) 
 			if(cumap->curr.ymax+d > cumap->clipr.ymax)
 				d1= -cumap->curr.ymax + cumap->clipr.ymax;

Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c	2008-03-16 19:38:04 UTC (rev 14144)
+++ trunk/blender/source/blender/src/drawnode.c	2008-03-16 20:01:52 UTC (rev 14145)
@@ -356,9 +356,11 @@
 
 		curvemap_buttons(block, node->storage, 's', B_NODE_EXEC+node->nr, B_REDR, butr);
 		
-		if(cumap) cumap->flag |= CUMA_DRAW_CFRA;
-		if(node->custom1<node->custom2)
-			cumap->sample[0]= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
+		if(cumap) {
+			cumap->flag |= CUMA_DRAW_CFRA;
+			if(node->custom1<node->custom2)
+				cumap->sample[0]= (float)(CFRA - node->custom1)/(float)(node->custom2-node->custom1);
+		}
 
 		uiBlockBeginAlign(block);
 		uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Sta:",