diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-03-31 20:14:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-03-31 20:14:31 +0300 |
| commit | 42853bacc9734f6559d8429b2001039e81d11c17 (patch) | |
| tree | 6fc7ab4d7ac200d6db9002715821cac99b10aa77 | |
| parent | ce5428b2946dd772f2a801a70778da853c683978 (diff) | |
GPencil: Fix regression with dots uvs
This was introduced by rBeccb0b222e3465baa71430223c5ee2f0206a7b02.
| -rw-r--r-- | source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/shaders/common_gpencil_lib.glsl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl index c0ff8d945f2..af8aec85598 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl @@ -61,7 +61,9 @@ void main() gp_interp.hardness); if (GPENCIL_IS_STROKE_VERTEX) { - gp_interp.uv.x *= gp_mat._stroke_u_scale; + if (!flag_test(gp_flag, GP_STROKE_ALIGNMENT)) { + gp_interp.uv.x *= gp_mat._stroke_u_scale; + } /* Special case: We don't use vertex color if material Holdout. */ if (flag_test(gp_flag, GP_STROKE_HOLDOUT)) { diff --git a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl index d6aaac78f14..0610bc4e57d 100644 --- a/source/blender/draw/intern/shaders/common_gpencil_lib.glsl +++ b/source/blender/draw/intern/shaders/common_gpencil_lib.glsl @@ -169,7 +169,7 @@ vec4 gpencil_vertex(ivec4 ma, if (GPENCIL_IS_STROKE_VERTEX) { bool is_dot = flag_test(material_flags, GP_STROKE_ALIGNMENT); - bool is_squares = !flag_test(material_flags, GP_STROKE_ALIGNMENT); + bool is_squares = !flag_test(material_flags, GP_STROKE_DOTS); /* Special Case. Stroke with single vert are rendered as dots. Do not discard them. */ if (!is_dot && ma.x == -1 && ma2.x == -1) { |