[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53361] trunk/blender/source/blender: Yesterday's memory free error fix in IMB_onehalf was wrong, it should

[Ton Roosendaal]

Revision: 53361
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53361
Author:   ton
Date:     2012-12-28 10:38:07 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Yesterday's memory free error fix in IMB_onehalf was wrong, it should 
be fixed in the icons code!

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c
    trunk/blender/source/blender/imbuf/intern/scaling.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2012-12-28 10:36:25 UTC (rev 53360)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2012-12-28 10:38:07 UTC (rev 53361)
@@ -575,9 +575,11 @@
 				glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, b16buf->x, b16buf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, b16buf->rect);
 				
 				while (b16buf->x > 1) {
-					b16buf = IMB_onehalf(b16buf);
-					glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, b16buf->x, b16buf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, b16buf->rect);
+					ImBuf *nbuf = IMB_onehalf(b16buf);
+					glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, nbuf->x, nbuf->y, 0, GL_RGBA, GL_UNSIGNED_BYTE, nbuf->rect);
 					level++;
+					IMB_freeImBuf(b16buf);
+					b16buf = nbuf;
 				}
 				
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
@@ -598,7 +600,7 @@
 	else
 		icontype = ICON_TYPE_BUFFER;
 	
-	if (b16buf) {
+	if (b32buf) {
 		for (y = 0; y < ICON_GRID_ROWS; y++) {
 			for (x = 0; x < ICON_GRID_COLS; x++) {
 				def_internal_icon(b32buf, BIFICONID_FIRST + y * ICON_GRID_COLS + x,

Modified: trunk/blender/source/blender/imbuf/intern/scaling.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/scaling.c	2012-12-28 10:36:25 UTC (rev 53360)
+++ trunk/blender/source/blender/imbuf/intern/scaling.c	2012-12-28 10:38:07 UTC (rev 53361)
@@ -360,8 +360,6 @@
 	
 	imb_onehalf_no_alloc(ibuf2, ibuf1);
 	
-	IMB_freeImBuf(ibuf1);
-	
 	return (ibuf2);
 }