diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-06-06 23:06:44 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-06-06 23:06:44 +0400 |
| commit | fff05927386a9ae4bdf3fc0c4a67d097e11a12a3 (patch) | |
| tree | 21c1465897a076df5101925a6c9e832e7a393422 /source/blender/editors/object | |
| parent | 5fca1aa323cd6e4c61e2c1901d62ff3f2b2d7b1e (diff) | |
Fix for new baker and float images. Also removed code used for debugging.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index af815988935..df3e58e5141 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -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]); |