Merge branch 'master' into tmp-widget-optitmp-widget-opti

# Conflicts:
#	source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl

3 files changed, 7 insertions, 5 deletions

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
index e2606473d07..fb5073b3dc7 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -473,8 +473,8 @@ void stroke_vertex()
     float miter_dot = dot(miter_tan, line_adj);
     /* Break corners after a certain angle to avoid really thick corners. */
     const float miter_limit = 0.5; /* cos(60°) */
-    bool miter_break = (miter_dot < miter_limit) || is_stroke_start || is_stroke_end;
-    miter_tan = (miter_break) ? line : (miter_tan / miter_dot);
+    bool miter_break = (miter_dot < miter_limit);
+    miter_tan = (miter_break || is_stroke_start || is_stroke_end) ? line : (miter_tan / miter_dot);
 
     vec2 miter = rotate_90deg(miter_tan);
 
@@ -487,7 +487,7 @@ void stroke_vertex()
 
     /* Reminder: we packed the cap flag into the sign of stength and thickness sign. */
     if ((is_stroke_start && strength1 > 0.0) || (is_stroke_end && thickness1 > 0.0) ||
-        miter_break) {
+        (miter_break && !is_stroke_start && !is_stroke_end)) {
       screen_ofs += line * x;
     }
 
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
index 8c2032f834a..d81c6f4fe0b 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
@@ -99,8 +99,10 @@ void main()
     discard;
   }
 
+  vec2 fb_size = max(vec2(textureSize(gpSceneDepthTexture, 0).xy),
+                     vec2(textureSize(gpMaskTexture, 0).xy));
+  vec2 uvs = gl_FragCoord.xy / fb_size;
   /* Manual depth test */
-  vec2 uvs = gl_FragCoord.xy / vec2(textureSize(gpSceneDepthTexture, 0).xy);
   float scene_depth = texture(gpSceneDepthTexture, uvs).r;
   if (gl_FragCoord.z > scene_depth) {
     discard;
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
index c6cfee5ef2d..225601eb9ba 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
@@ -2,4 +2,4 @@
 void main()
 {
   gpencil_vertex();
-}
\ No newline at end of file
+}