diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:34:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:34:17 +0300 |
commit | f60896454929080ae775a7143c30722788ab83df (patch) | |
tree | 33accd750fb55f00b33730c5bb601254799fd369 /source/blender/editors/object | |
parent | 403ae48063d91126bd36ca56920290bcb53f504e (diff) | |
parent | 2c8bd1d8cb6dc0f1a182d77c6b8283b25a01f1eb (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_bake_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 08bf08d0b62..e3e3f3d10ef 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -192,7 +192,7 @@ static bool write_internal_bake_pixels( RE_bake_mask_fill(pixel_array, num_pixels, mask_buffer); } - is_float = (ibuf->flags & IB_rectfloat); + is_float = (ibuf->rect_float != NULL); /* colormanagement conversions */ if (!is_noncolor) { |