diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-11 03:08:02 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-11 03:08:02 +0300 |
| commit | 09549c45383ef6f73e8c4c32220096b1385ed853 (patch) | |
| tree | e9363e5727c3059f502cd6287b23f4eec4c0ec1c /source/blender/src/butspace.c | |
| parent | e7285229b824f959f84efe6774c506034cf0f98e (diff) | |
Orange: Added Alpha viewing option in Image window.
Diffstat (limited to 'source/blender/src/butspace.c')
| -rw-r--r-- | source/blender/src/butspace.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index 0041f49f018..efb59495fd1 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -268,22 +268,26 @@ static void curvemap_buttons_zoom_out(void *cumap_v, void *unused) if( (cumap->curr.xmax - cumap->curr.xmin) < 20.0f*(cumap->clipr.xmax - cumap->clipr.xmin) ) { d= d1= 0.15f*(cumap->curr.xmax - cumap->curr.xmin); - if(cumap->curr.xmin-d < cumap->clipr.xmin) - d1= cumap->curr.xmin - cumap->clipr.xmin; + if(cumap->flag & CUMA_DO_CLIP) + if(cumap->curr.xmin-d < cumap->clipr.xmin) + d1= cumap->curr.xmin - cumap->clipr.xmin; cumap->curr.xmin-= d1; - if(cumap->curr.xmax+d > cumap->clipr.xmax) - d1= -cumap->curr.xmax + cumap->clipr.xmax; + if(cumap->flag & CUMA_DO_CLIP) + if(cumap->curr.xmax+d > cumap->clipr.xmax) + d1= -cumap->curr.xmax + cumap->clipr.xmax; cumap->curr.xmax+= d1; d= d1= 0.15f*(cumap->curr.ymax - cumap->curr.ymin); - if(cumap->curr.ymin-d < cumap->clipr.ymin) - d1= cumap->curr.ymin - cumap->clipr.ymin; + if(cumap->flag & CUMA_DO_CLIP) + if(cumap->curr.ymin-d < cumap->clipr.ymin) + d1= cumap->curr.ymin - cumap->clipr.ymin; cumap->curr.ymin-= d1; - if(cumap->curr.ymax+d > cumap->clipr.ymax) - d1= -cumap->curr.ymax + cumap->clipr.ymax; + if(cumap->flag & CUMA_DO_CLIP) + if(cumap->curr.ymax+d > cumap->clipr.ymax) + d1= -cumap->curr.ymax + cumap->clipr.ymax; cumap->curr.ymax+= d1; } } |