diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
| commit | d65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch) | |
| tree | 2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/blender/editors/object/object_bake.c | |
| parent | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff) | |
| parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) | |
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/blender/editors/object/object_bake.c')
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index fc5f09f2fe0..cc9a6f7f5f0 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -858,7 +858,7 @@ static void finish_images(MultiresBakeRender *bkr) 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]) { |