diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-20 19:20:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-20 19:20:33 +0400 |
| commit | 692e0ebc1312fc39753a899e35f77db0577339c0 (patch) | |
| tree | b4e4c3bca3e365ee2dd2d37e52772d0bf79df767 /source/blender/render | |
| parent | 11014defdb8cf93fb339e2442a93fbc2525586fa (diff) | |
fix for incorrect bake api usage. but not a bug.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index b6af781f4d4..27c87caf14a 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -210,6 +210,6 @@ struct Object; 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 */ diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 096a278a705..6747784b21a 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -2556,7 +2556,7 @@ static void *do_bake_thread(void *bs_v) 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 @@ void RE_bake_ibuf_filter(ImBuf *ibuf, unsigned char *UNUSED(mask), const int fil * 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 @@ void RE_bake_ibuf_filter(ImBuf *ibuf, unsigned char *UNUSED(mask), const int fil 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 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up 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); |