sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Yesterday's memory free error fix in IMB_onehalf was wrong, it should

Browse Source 
be fixed in the icons code!
This commit is contained in:
Ton Roosendaal 2012-12-28 10:38:07 +00:00
parent 6061ecca0b
commit 914b0aafa5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/interface_icons.c
View File

@ -575,9 +575,11 @@ static void init_internal_icons(void)
glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, b16buf->x, b16buf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, b16buf->rect); glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, b16buf->x, b16buf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, b16buf->rect);
while (b16buf->x > 1) { while (b16buf->x > 1) {
b16buf = IMB_onehalf(b16buf); ImBuf *nbuf = IMB_onehalf(b16buf);
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, b16buf->x, b16buf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, b16buf->rect); glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, nbuf->x, nbuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, nbuf->rect);
level++; level++;
IMB_freeImBuf(b16buf);
b16buf = nbuf;
} }
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
@ -598,7 +600,7 @@ static void init_internal_icons(void)
else else
icontype = ICON_TYPE_BUFFER; icontype = ICON_TYPE_BUFFER;
if (b16buf) { if (b32buf) {
for (y = 0; y < ICON_GRID_ROWS; y++) { for (y = 0; y < ICON_GRID_ROWS; y++) {
for (x = 0; x < ICON_GRID_COLS; x++) { for (x = 0; x < ICON_GRID_COLS; x++) {
def_internal_icon(b32buf, BIFICONID_FIRST + y * ICON_GRID_COLS + x, def_internal_icon(b32buf, BIFICONID_FIRST + y * ICON_GRID_COLS + x,

2
source/blender/imbuf/intern/scaling.c
View File

@ -360,8 +360,6 @@ ImBuf *IMB_onehalf(struct ImBuf *ibuf1)
imb_onehalf_no_alloc(ibuf2, ibuf1); imb_onehalf_no_alloc(ibuf2, ibuf1);
IMB_freeImBuf(ibuf1);
return (ibuf2); return (ibuf2);
} }