← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_sequencer/sequencer_draw.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_sequencer/sequencer_draw.c
173
173
                
174
174
                default:
175
175
                        col[0] = 10; col[1] = 255; col[2] = 40;
 
176
                        break;
176
177
        }
177
178
}
178
179
 
925
926
                /* stop all running jobs, except screen one. currently previews frustrate Render
926
927
                 * needed to make so sequencer's rendering doesn't conflict with compositor
927
928
                 */
928
 
                WM_jobs_kill_type(CTX_wm_manager(C), WM_JOB_TYPE_COMPOSITE);
 
929
                WM_jobs_kill_type(CTX_wm_manager(C), NULL, WM_JOB_TYPE_COMPOSITE);
929
930
 
930
931
                if ((scene->r.seq_flag & R_SEQ_GL_PREV) == 0) {
931
932
                        /* in case of final rendering used for preview, kill all previews,
932
933
                         * otherwise threading conflict will happen in rendering module
933
934
                         */
934
 
                        WM_jobs_kill_type(CTX_wm_manager(C), WM_JOB_TYPE_RENDER_PREVIEW);
 
935
                        WM_jobs_kill_type(CTX_wm_manager(C), NULL, WM_JOB_TYPE_RENDER_PREVIEW);
935
936
                }
936
937
        }
937
938
 
1085
1086
                        type = GL_FLOAT;
1086
1087
 
1087
1088
                        if (ibuf->float_colorspace) {
1088
 
                                glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(C, ibuf->float_colorspace, TRUE);
 
1089
                                glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(C, ibuf->float_colorspace, true);
1089
1090
                        }
1090
1091
                        else {
1091
 
                                glsl_used = IMB_colormanagement_setup_glsl_draw_ctx(C, TRUE);
 
1092
                                glsl_used = IMB_colormanagement_setup_glsl_draw_ctx(C, true);
1092
1093
                        }
1093
1094
                }
1094
1095
                else if (ibuf->rect) {
1096
1097
                        format = GL_RGBA;
1097
1098
                        type = GL_UNSIGNED_BYTE;
1098
1099
 
1099
 
                        glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(C, ibuf->rect_colorspace, FALSE);
 
1100
                        glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(C, ibuf->rect_colorspace, false);
1100
1101
                }
1101
1102
                else {
1102
1103
                        format = GL_RGBA;