diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-01-27 18:28:55 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-01-29 17:07:45 +0300 |
commit | 18c88eac171a814f94142d442494ea6f5eeeab02 (patch) | |
tree | 9a5fbc81db038a3d322b818e520d93c520e7da1e /source/blender/draw/intern | |
parent | b683fcb62876f345a49bf66c94781a6fa789b946 (diff) |
Fix T73188: RenderResult as Camera BG Image
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 issues introduced 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.
Reviewed By: fclem, brecht
Differential Revision: https://developer.blender.org/D6684
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index c6fc244121c..f9a6b663900 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1226,7 +1226,7 @@ static DRWShadingGroup *drw_shgroup_material_inputs(DRWShadingGroup *grp, else { textarget = GL_TEXTURE_2D; } - *tex_ref = tex = GPU_texture_from_blender(input->ima, input->iuser, textarget); + *tex_ref = tex = GPU_texture_from_blender(input->ima, input->iuser, NULL, textarget); GPU_texture_ref(tex); } |