Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for new baker and float images. Also removed code used for debugging.

Browse Source
This commit is contained in:
Sergey Sharybin
2011-06-06 19:06:44 +00:00
parent 5fca1aa323
commit fff0592738
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/object/object_bake.c
View File

@@ -651,6 +651,8 @@ static void apply_heights_data(void *bake_data)
}
}
}
ibuf->userflags= IB_RECT_INVALID;
}
static void free_heights_data(void *bake_data)
@@ -685,10 +687,6 @@ static void apply_heights_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm,
lores_dm->getFace(lores_dm, face_index, &mface);
if(x==0 && y==0) {
zero_v3(p0);
}
st0= mtface[face_index].uv[0];
st1= mtface[face_index].uv[1];
st2= mtface[face_index].uv[2];
@@ -731,6 +729,8 @@ static void apply_heights_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm,
if(ibuf->rect_float) {
float *rrgbf= ibuf->rect_float + pixel*4;
rrgbf[3]= 1.0f;
ibuf->userflags= IB_RECT_INVALID;
} else {
char *rrgb= (char*)ibuf->rect + pixel*4;
rrgb[3]= 255;
@@ -782,6 +782,8 @@ static void apply_tangmat_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm,
rrgbf[1]= vec[1];
rrgbf[2]= vec[2];
rrgbf[3]= 1.0f;
ibuf->userflags= IB_RECT_INVALID;
} else {
char *rrgb= (char*)ibuf->rect + pixel*4;
rrgb[0]= FTOCHAR(vec[0]);