Details

Reviewers

Clément Foucault (fclem)
Brecht Van Lommel (brecht)

Maniphest Tasks

T73188: Viewer node and Render result not showing in camera background image

Commits

rB18c88eac171a: Fix T73188: RenderResult as Camera BG Image

Summary

In blender 2.79 you could use a render result as a camera background
image. This is useful during layout/compositing. During Blender 2.80
development there were 2 changes that removed this feature.

to receive a render result the image required a lock. This lock wasn't passed and therefore no image was read from the result. Generating an GPUTexture from an Blender image also didn't do the locking.
the iuser->scene field wasn't set what is required for render results.

This change adds an optional ibuf parameter to GPU_texture_from_blender that can be passed when available.

Diff Detail

Repository

rB Blender

Branch

T73188 (branched from master)

Build Status

Buildable 6395
Build 6395: arc lint + arc unit

Event Timeline

Jeroen Bakker (jbakker) created this revision.Jan 27 2020, 4:37 PM

Harbormaster completed remote builds in B6395: Diff 21167.Jan 27 2020, 4:37 PM

Jeroen Bakker (jbakker) added a reviewer: Clément Foucault (fclem).Jan 27 2020, 4:38 PM

Jeroen Bakker (jbakker) added a project: GPU / Viewport.

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Jan 27 2020, 4:40 PM

Jeroen Bakker (jbakker) added inline comments.

source/blender/blenloader/intern/versioning_280.c
4369	I am not sure what is the best way to do this. Perhaps we should use the first scene where the camera is used.
source/blender/gpu/intern/gpu_draw.c
854	add comment that this function is similar to `GPU_texture_from_blender`.

The GPU side of things makes sense to me. But maybe add another reviewer to have a second eye on the general approach. It's not 100% familiar with the iuser management.

This revision is now accepted and ready to land.Jan 27 2020, 5:08 PM

Code cleanup: Merged GPU_texture_from_blender_with_ibuf into GPU_texture_from_blender.

Harbormaster completed remote builds in B6402: Diff 21192.Jan 28 2020, 7:56 AM

Jeroen Bakker (jbakker) edited the summary of this revision. (Show Details)Jan 28 2020, 7:59 AM

Jeroen Bakker (jbakker) added a reviewer: Brecht Van Lommel (brecht).

This revision now requires review to proceed.Jan 28 2020, 7:59 AM

@Brecht Van Lommel (brecht) I added you as reviewer as this is related to how the ImBuf can be acquired for a RenderResult. In this case it is required to have a valid iuser->scene and the ImBuf needs to be guarded by a lock.