archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T92608: Image Editor does not display stereo images

Browse Source 
Caused by own {rB5aa3167e48b2}.
Related commit: {rBebaa3fcedd23}.

For stereo renders, `BKE_image_is_multilayer` is true, however we seem
to get to down to `space_image_gpu_texture_get` [where this is called]
from `IMAGE_cache_init` with a NULL Image->RenderResult.

So what then happens is that `BKE_image_multilayer_index` is called and
even though it has an appropriate codepath for stereo, it earlies out
and does not set multi_index correctly.

Still a bit puzzled why RenderResult is NULL for a render, but since
other places also check for a valid RenderResult before going down the
_multilayer_ route (and doing _multiview_ instead), now do the same
thing, BKE_image_multiview_index is now called in these cases (and seems
to behave correctly, checked with layers and passes and all seems to
display correctly, either in stereo or choosing individual eyes).

thx @jbakker & @brecht for double-checking.

Maniphest Tasks: T92608

Differential Revision: https://developer.blender.org/D13063
This commit is contained in:
Philipp Oeser
2021-11-01 11:03:58 +01:00
parent 69a7734b75
commit a5b996df88
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/image/image_engine.c
View File

@@ -107,7 +107,7 @@ static void space_image_gpu_texture_get(Image *image,
{ {
const DRWContextState *draw_ctx = DRW_context_state_get(); const DRWContextState *draw_ctx = DRW_context_state_get();
SpaceImage *sima = (SpaceImage *)draw_ctx->space_data; SpaceImage *sima = (SpaceImage *)draw_ctx->space_data;
if (BKE_image_is_multilayer(image)) { if (image->rr != NULL) {
/* Update multi-index and pass for the current eye. */ /* Update multi-index and pass for the current eye. */
BKE_image_multilayer_index(image->rr, &sima->iuser); BKE_image_multilayer_index(image->rr, &sima->iuser);
} }