[Bf-blender-cvs] [13c7df1054d] master: Fix T80193 Sequencer: Crash on float images when OCIO GLSL shader can't be used

Clément Foucault noreply at git.blender.org
Tue Sep 15 15:22:29 CEST 2020


Commit: 13c7df1054d6762d92649adc27a4316356ad092c
Author: Clément Foucault
Date:   Tue Sep 15 15:21:11 2020 +0200
Branches: master
https://developer.blender.org/rB13c7df1054d6762d92649adc27a4316356ad092c

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

===================================================================

M	source/blender/editors/space_sequencer/sequencer_draw.c

===================================================================

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);



More information about the Bf-blender-cvs mailing list