griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

masked/alpha baking commit was missing a null check for imbuf,

Browse Source 
made textures also bake alpha
This commit is contained in:
Campbell Barton
2008-03-09 18:06:48 +00:00
parent 746888febd
commit 2299f0d946
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/source/rendercore.c
View File

@@ -1983,13 +1983,14 @@ static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int quad, int
shr.combined[0]= shi->r;
shr.combined[1]= shi->g;
shr.combined[2]= shi->b;
shr.alpha = shi->alpha;
}
}
if(bs->rect_float) {
float *col= bs->rect_float + 4*(bs->rectx*y + x);
VECCOPY(col, shr.combined);
if (bs->type==RE_BAKE_ALL) {
if (bs->type==RE_BAKE_ALL || bs->type==RE_BAKE_TEXTURE) {
col[3]= shr.alpha;
} else {
col[3]= 1.0;
@@ -2002,7 +2003,7 @@ static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int quad, int
col[2]= FTOCHAR(shr.combined[2]);
if (bs->type==RE_BAKE_ALL) {
if (bs->type==RE_BAKE_ALL || bs->type==RE_BAKE_TEXTURE) {
col[3]= FTOCHAR(shr.alpha);
} else {
col[3]= 255;
@@ -2337,8 +2338,6 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob)
get_next_bake_face(NULL);
/* do we need a mask? */
/*if ((re->r.bake_mode==RE_BAKE_ALL) && (re->r.bake_filter) && (re->r.bake_flag & R_BAKE_CLEAR)==0)*/
if (re->r.bake_filter && (re->r.bake_flag & R_BAKE_CLEAR)==0)
usemask = 1;
@@ -2346,7 +2345,8 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob)
for(ima= G.main->image.first; ima; ima= ima->id.next) {
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
ima->id.flag |= LIB_DOIT;
ibuf->userdata = NULL; /* use for masking if needed */
if (ibuf)
ibuf->userdata = NULL; /* use for masking if needed */
}
BLI_init_threads(&threads, do_bake_thread, re->r.threads);