[Bf-blender-cvs] [12720d8b9b3] master: GPencil: Cleanup int comparisons

Antonio Vazquez noreply at git.blender.org
Wed Mar 18 11:12:19 CET 2020


Commit: 12720d8b9b3876139bdf5cdf48898b66e4952cf5
Author: Antonio Vazquez
Date:   Wed Mar 18 11:12:11 2020 +0100
Branches: master
https://developer.blender.org/rB12720d8b9b3876139bdf5cdf48898b66e4952cf5

GPencil: Cleanup int comparisons

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl

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

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 93c9fdcecb3..cb34515a960 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -367,7 +367,7 @@ void stroke_vertex()
   bool is_squares = false;
 
 #  ifdef GP_MATERIAL_BUFFER_LEN
-  if (m != -1.0) {
+  if (m != -1) {
     is_dot = GP_FLAG_TEST(MATERIAL(m).flag, GP_STROKE_ALIGNMENT);
     is_squares = !GP_FLAG_TEST(MATERIAL(m).flag, GP_STROKE_DOTS);
   }
@@ -463,8 +463,8 @@ void stroke_vertex()
     strokeThickness = (is_squares) ? 1e18 : (thickness / gl_Position.w);
   }
   else {
-    bool is_stroke_start = (ma.x == -1.0 && x == -1.0);
-    bool is_stroke_end = (ma3.x == -1.0 && x == 1.0);
+    bool is_stroke_start = (ma.x == -1 && x == -1);
+    bool is_stroke_end = (ma3.x == -1 && x == 1);
 
     /* Mitter tangent vector. */
     vec2 miter_tan = safe_normalize(line_adj + line);



More information about the Bf-blender-cvs mailing list