diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-12 15:45:16 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-12 15:45:16 +0400 |
| commit | 7c3ce049ed55a756fbec1943bb5b7615a74f6c9c (patch) | |
| tree | 7ba77f987869c382c7d66bac4f838a62baa6c6ed /source/blender/blenkernel/intern/image.c | |
| parent | a9cebb2555e18741f5fe218034036a31f69439ea (diff) | |
Fix incorrect display of Sequence layer when rendering animation and
float/byte render results were mixed.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 018cd25187a..de85cb54cfd 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -2737,6 +2737,14 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_ if (rres.have_combined && layer == 0) { /* pass */ } + else if (rect && layer == 0) { + /* rect32 is set when there's a Sequence pass, this pass seems + * to have layer=0 (this is from image_buttons.c) + * in this case we ignore float buffer, because it could have + * hung from previous pass which was float + */ + rectf = NULL; + } else if (rres.layers.first) { RenderLayer *rl = BLI_findlink(&rres.layers, layer - (rres.have_combined ? 1 : 0)); if (rl) { |