diff options
author | Juho Vepsalainen <bebraw@gmail.com> | 2007-05-03 19:10:44 +0400 |
---|---|---|
committer | Juho Vepsalainen <bebraw@gmail.com> | 2007-05-03 19:10:44 +0400 |
commit | c71949419ed68ef1026b4ac7ac391a51ce055ae8 (patch) | |
tree | 910871aaad78fc88a53fb2213dbcc58f2a49522c /source/blender/src | |
parent | 7c5c0db23dc6b35d3e26129b2fc1764c859b80b4 (diff) |
== UV/Image Editor ==
Patch #6570.
This patch adds color and alpha selectors to Image -> "New..." dialog.
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/editsima.c | 13 | ||||
-rw-r--r-- | source/blender/src/toolbox.c | 5 | ||||
-rw-r--r-- | source/blender/src/verse_object.c | 4 |
3 files changed, 14 insertions, 8 deletions
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 2af4444cd08..40cbe36ac8c 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -1881,7 +1881,8 @@ void reload_image_sima(void) void new_image_sima(void) { static int width= 256, height= 256; - static short uvtestgrid=0; + static short uvtestgrid= 0; + static float color[] = {0, 0, 0, 1}; char name[22]; strcpy(name, "Untitled"); @@ -1889,11 +1890,13 @@ void new_image_sima(void) add_numbut(0, TEX, "Name:", 0, 21, name, NULL); add_numbut(1, NUM|INT, "Width:", 1, 5000, &width, NULL); add_numbut(2, NUM|INT, "Height:", 1, 5000, &height, NULL); - add_numbut(3, TOG|SHO, "UV Test Grid", 0, 0, &uvtestgrid, NULL); - if (!do_clever_numbuts("New Image", 4, REDRAW)) - return; + add_numbut(3, COL, "", 0, 0, &color, NULL); + add_numbut(4, NUM|FLO, "Alpha:", 0.0, 1.0, &color[3], NULL); + add_numbut(5, TOG|SHO, "UV Test Grid", 0, 0, &uvtestgrid, NULL); + if (!do_clever_numbuts("New Image", 6, REDRAW)) + return; - G.sima->image= BKE_add_image_size(width, height, name, uvtestgrid); + G.sima->image= BKE_add_image_size(width, height, name, uvtestgrid, color); BKE_image_signal(G.sima->image, &G.sima->iuser, IMA_SIGNAL_USER_NEW_IMAGE); image_changed(G.sima, 0); diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 0657d89f1fc..4a3dde25c67 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -570,8 +570,9 @@ int do_clever_numbuts(char *name, int tot, int winevent) if(varstr->type==TEX) { uiDefBut(block, TEX, 0, varstr->name,(short)((x1+15) + (sizex*xi)),(short)(y2-55- 20*yi),(short)(sizex), 19, numbpoin[a], varstr->min, varstr->max, 0, 0, varstr->tip); - } - else { + } else if(varstr->type==COL) { + uiDefButF(block, COL, 0, "",(short)((x1+15) + (sizex*xi)),(short)(y2-55- 20*yi),(short)(sizex), 19, numbpoin[a], varstr->min, varstr->max, 0, 0, ""); + } else { if(varstr->type==LABEL) {/* dont include the label when rounding the buttons */ uiBlockEndAlign(block); diff --git a/source/blender/src/verse_object.c b/source/blender/src/verse_object.c index 3cebb8fad12..fc937469d42 100644 --- a/source/blender/src/verse_object.c +++ b/source/blender/src/verse_object.c @@ -270,6 +270,7 @@ void b_verse_pop_node(VNode *vnode) else if(vnode->type==V_NT_BITMAP) { struct VBitmapData *vbitmap; struct VBitmapLayer *vblayer; + float color[] = {0, 0, 0, 1}; vbitmap = (VBitmapData*)vnode->data; @@ -293,7 +294,8 @@ void b_verse_pop_node(VNode *vnode) vbitmap->width, vbitmap->height, vnode->name, - 0); + 0, + color); ((Image*)vbitmap->image)->vnode = (void*)vnode; sync_blender_image_with_verse_bitmap_node(vnode); |