Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-09-15 16:21:11 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-09-15 16:22:26 +0300
commit13c7df1054d6762d92649adc27a4316356ad092c (patch)
tree54c522b250ce7c819c6989b2e32c1b6cfc1c33f4 /source/blender/editors/space_sequencer
parent9f12ea496a3f6a0a066e3ed6ec557cc9ec37d776 (diff)
Fix T80193 Sequencer: Crash on float images when OCIO GLSL shader can't be used
This was just an oversight from refactoring this code in rBfaeaf5325554e37981424ded5add7bf2df484c55
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 662be2491a0..6efd95efe25 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1524,6 +1524,8 @@ static void *sequencer_OCIO_transform_ibuf(const bContext *C,
* properly, in this case we fallback to CPU-based display transform. */
if ((ibuf->rect || ibuf->rect_float) && !*r_glsl_used) {
display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
+ *r_format = GPU_RGBA8;
+ *r_data = GPU_DATA_UNSIGNED_BYTE;
}
if (cache_handle) {
IMB_display_buffer_release(cache_handle);