diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-04-26 23:05:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-04-26 23:05:22 +0400 |
| commit | 2e134e84abf0dfc06520e4e2001941ef3ccc2eb0 (patch) | |
| tree | 3f01e8658fee0421293927259df391346ae8ea1a /source | |
| parent | 71ac221ea35dad82daca45f91a51625641ab1196 (diff) | |
drawview.c - Passepartout, only do GL alpha when not 1.0 alpha
buttons_editing.c - negative camera lense was possible with (Deg) button enabled
export_cal3d.c - minor changes
object_batch_name_edit.py - check for data and object libdata before renaming.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 2 | ||||
| -rw-r--r-- | source/blender/src/drawview.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 6bf20a228ea..ec9a0020685 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -3027,7 +3027,7 @@ static void editing_panel_camera_type(Object *ob, Camera *cam) } else { if(cam->flag & CAM_ANGLETOGGLE) { but= uiDefButF(block, NUM,REDRAWVIEW3D, "Lens:", - 10, 160, 130, 20, &cam->angle, 1.0, 250.0, 100, 0, "Specify the lens of the camera in degrees"); + 10, 160, 130, 20, &cam->angle, 7.323871, 172.847331, 100, 0, "Specify the lens of the camera in degrees"); uiButSetFunc(but,do_angletolensconversion_cb, &cam->lens, &cam->angle); } else { diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 6ff4d35e4a9..93de097a908 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -986,11 +986,14 @@ static void drawviewborder(void) y2= viewborder.ymax; /* passepartout, specified in camera edit buttons */ - if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT)) { - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glEnable(GL_BLEND); - glColor4f(0, 0, 0, ca->passepartalpha); - + if (ca && (ca->flag & CAM_SHOWPASSEPARTOUT) && ca->passepartalpha > 0.000001) { + if (ca->passepartalpha == 1.0) { + glColor3f(0, 0, 0); + } else { + glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + glEnable(GL_BLEND); + glColor4f(0, 0, 0, ca->passepartalpha); + } if (x1 > 0.0) glRectf(0.0, (float)curarea->winy, x1, 0.0); if (x2 < (float)curarea->winx) |