[Bf-blender-cvs] [1f949121cd3] master: Fix T74969: Crash in gpencil edit mode

mano-wii noreply at git.blender.org
Sat Mar 28 00:12:24 CET 2020


Commit: 1f949121cd3f58ecd2d8a29caad68a618ba4efd3
Author: mano-wii
Date:   Fri Mar 27 20:11:23 2020 -0300
Branches: master
https://developer.blender.org/rB1f949121cd3f58ecd2d8a29caad68a618ba4efd3

Fix T74969: Crash in gpencil edit mode

Result of poor shader pre-processing on Intel HD 4000 drivers

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

M	source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl

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

diff --git a/source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl
index 3a52e0c73b7..732e392ffe0 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl
@@ -21,11 +21,11 @@ void discard_vert()
   gl_Position = vec4(0.0, 0.0, -3e36, 0.0);
 }
 
-#define GP_EDIT_POINT_SELECTED (1u << 0u)
-#define GP_EDIT_STROKE_SELECTED (1u << 1u)
-#define GP_EDIT_MULTIFRAME (1u << 2u)
-#define GP_EDIT_STROKE_START (1u << 3u)
-#define GP_EDIT_STROKE_END (1u << 4u)
+#define GP_EDIT_POINT_SELECTED 1u  /* 1 << 0 */
+#define GP_EDIT_STROKE_SELECTED 2u /* 1 << 1 */
+#define GP_EDIT_MULTIFRAME 4u      /* 1 << 2 */
+#define GP_EDIT_STROKE_START 8u    /* 1 << 3 */
+#define GP_EDIT_STROKE_END 16u     /* 1 << 4 */
 
 #ifdef USE_POINTS
 #  define colorUnselect colorGpencilVertex



More information about the Bf-blender-cvs mailing list