[Bf-blender-cvs] [797dfa6a0a7] master: Merge branch 'blender-v2.91-release'

[Richard Antalik]

Commit: 797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064
Author: Richard Antalik
Date:   Tue Nov 17 04:10:51 2020 +0100
Branches: master
https://developer.blender.org/rB797dfa6a0a7d5d2bf62bdc03cf619addbc9e1064

Merge branch 'blender-v2.91-release'

Conflicts:
	source/blender/editors/render/render_opengl.c
	source/blender/sequencer/intern/effects.c

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



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

diff --cc source/blender/editors/render/render_opengl.c
index 79eaf007fcb,8cad3b94fe9..696c18d17c5
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -489,14 -488,14 +489,14 @@@ static void screen_opengl_render_apply(
      SpaceSeq *sseq = oglrender->sseq;
      int chanshown = sseq ? sseq->chanshown : 0;
  
 -    BKE_sequencer_new_render_data(oglrender->bmain,
 +    SEQ_render_new_render_data(oglrender->bmain,
-                                oglrender->depsgraph,
-                                scene,
-                                oglrender->sizex,
-                                oglrender->sizey,
-                                100,
-                                false,
-                                &context);
+                                   oglrender->depsgraph,
+                                   scene,
+                                   oglrender->sizex,
+                                   oglrender->sizey,
+                                   SEQ_RENDER_SIZE_SCENE,
+                                   false,
+                                   &context);
  
      for (view_id = 0; view_id < oglrender->views_len; view_id++) {
        context.view_id = view_id;
diff --cc source/blender/gpu/intern/gpu_immediate.cc
index 110774640f1,979b3cbb557..95718391165
--- a/source/blender/gpu/intern/gpu_immediate.cc
+++ b/source/blender/gpu/intern/gpu_immediate.cc
@@@ -187,9 -192,13 +192,13 @@@ static void wide_line_workaround_start(
    }
  }
  
 -static void wide_line_workaround_end(void)
 +static void wide_line_workaround_end()
  {
    if (imm->prev_shader) {
+     if (GPU_blend_get() == GPU_BLEND_NONE) {
+       /* Restore default. */
+       immUniform1i("lineSmooth", 1);
+     }
      immUnbindProgram();
  
      immBindShader(imm->prev_shader);
diff --cc source/blender/sequencer/intern/effects.c
index 1d323426cc3,dd7634a10eb..ba16206ce97
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@@ -3915,7 -3902,7 +3915,7 @@@ static ImBuf *do_text_effect(const SeqR
    /* Compensate text size for preview render size. */
    proxy_size_comp = context->scene->r.size / 100.0;
    if (context->preview_render_size != SEQ_RENDER_SIZE_SCENE) {
-     proxy_size_comp *= SEQ_rendersize_to_scale_factor(context->preview_render_size);
 -    proxy_size_comp = BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
++    proxy_size_comp = SEQ_rendersize_to_scale_factor(context->preview_render_size);
    }
  
    /* set before return */