[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37668] trunk/blender/source/blender: fix for incorrect bake api usage.

[Campbell Barton]

Revision: 37668
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37668
Author:   campbellbarton
Date:     2011-06-20 15:20:33 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
fix for incorrect bake api usage. but not a bug.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_bake.c
    trunk/blender/source/blender/render/extern/include/RE_shader_ext.h
    trunk/blender/source/blender/render/intern/source/rendercore.c

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2011-06-20 15:17:02 UTC (rev 37667)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2011-06-20 15:20:33 UTC (rev 37668)
@@ -858,7 +858,7 @@
 		if(ibuf->x<=0 || ibuf->y<=0)
 			continue;
 
-		RE_bake_ibuf_filter(ibuf, (unsigned char *)ibuf->userdata, bkr->bake_filter);
+		RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, bkr->bake_filter);
 
 		ibuf->userflags|= IB_BITMAPDIRTY;
 		if(ibuf->mipmap[0]) {

Modified: trunk/blender/source/blender/render/extern/include/RE_shader_ext.h
===================================================================
--- trunk/blender/source/blender/render/extern/include/RE_shader_ext.h	2011-06-20 15:17:02 UTC (rev 37667)
+++ trunk/blender/source/blender/render/extern/include/RE_shader_ext.h	2011-06-20 15:20:33 UTC (rev 37668)
@@ -210,6 +210,6 @@
 
 int RE_bake_shade_all_selected(struct Render *re, int type, struct Object *actob, short *do_update, float *progress);
 struct Image *RE_bake_shade_get_image(void);
-void RE_bake_ibuf_filter(struct ImBuf *ibuf, unsigned char *mask, const int filter);
+void RE_bake_ibuf_filter(struct ImBuf *ibuf, char *mask, const int filter);
 
 #endif /* RE_SHADER_EXT_H */

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2011-06-20 15:17:02 UTC (rev 37667)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2011-06-20 15:20:33 UTC (rev 37668)
@@ -2556,7 +2556,7 @@
 	return NULL;
 }
 
-void RE_bake_ibuf_filter(ImBuf *ibuf, unsigned char *UNUSED(mask), const int filter)
+void RE_bake_ibuf_filter(ImBuf *ibuf, char *mask, const int filter)
 {
 	/* must check before filtering */
 	const short is_new_alpha= (ibuf->depth != 32) && BKE_alphatest_ibuf(ibuf);
@@ -2570,9 +2570,9 @@
 		 * this is so colors dont blend in from outside */
 
 		for(i=0; i< filter; i++)
-			IMB_mask_filter_extend((char *)ibuf->userdata, ibuf->x, ibuf->y);
+			IMB_mask_filter_extend(mask, ibuf->x, ibuf->y);
 
-		temprect = MEM_dupallocN(ibuf->userdata);
+		temprect = MEM_dupallocN(mask);
 
 		/* expand twice to clear this many pixels, so they blend back in */
 		IMB_mask_filter_extend(temprect, ibuf->x, ibuf->y);
@@ -2583,7 +2583,7 @@
 		MEM_freeN(temprect);
 
 		for(i= 0; i < filter; i++)
-			IMB_filter_extend(ibuf, (char *)ibuf->userdata);
+			IMB_filter_extend(ibuf, mask);
 	}
 
 	/* if the bake results in new alpha then change the image setting */
@@ -2684,7 +2684,7 @@
 			if(!ibuf)
 				continue;
 
-			RE_bake_ibuf_filter(ibuf, (unsigned char *)ibuf->userdata, re->r.bake_filter);
+			RE_bake_ibuf_filter(ibuf, (char *)ibuf->userdata, re->r.bake_filter);
 
 			ibuf->userflags |= IB_BITMAPDIRTY;
 			if (ibuf->rect_float) IMB_rect_from_float(ibuf);