Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl4
-rw-r--r--source/blender/draw/intern/shaders/common_gpencil_lib.glsl2
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) {