diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-11-09 02:00:55 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-11-09 02:00:55 +0300 |
| commit | be68e2b793c3f016cf7e08122de2ff03b742a098 (patch) | |
| tree | 23ea992b65b96daacef6b7f1294df1829e7f8ec7 /source/blender/src/resources.c | |
| parent | 8fa6cd8c94e8dfe1dda24ad4c723da2d09fd17a7 (diff) | |
- removed options from main header 'render' menu;
render opengl 3d window at this location gave unpredictable results, and
crashes occasionally. Moved it back to header as icon for now... the
view pulldown menu in 3d header is too full.
Diffstat (limited to 'source/blender/src/resources.c')
| -rw-r--r-- | source/blender/src/resources.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 533530bf28b..9746a80982b 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -126,18 +126,19 @@ static void icon_draw_blended(Icon *icon, unsigned char blendcol[3]) static void icon_draw_blended(Icon *icon, char *blendcol, int shade) { - float r, g, b; + /* commented out, for now only alpha (ton) */ +// float r, g, b; - r= (-shade + (float)blendcol[0])/180.0; - g= (-shade + (float)blendcol[1])/180.0; - b= (-shade + (float)blendcol[2])/180.0; +// r= (-shade + (float)blendcol[0])/180.0; +// g= (-shade + (float)blendcol[1])/180.0; +// b= (-shade + (float)blendcol[2])/180.0; // glPixelTransferf(GL_RED_SCALE, r>0.0?r:0.0); // glPixelTransferf(GL_GREEN_SCALE, g>0.0?g:0.0); // glPixelTransferf(GL_BLUE_SCALE, b>0.0?b:0.0); if(shade < 0) { - r= (128+shade)/128.0; + float r= (128+shade)/128.0; glPixelTransferf(GL_ALPHA_SCALE, r); } |