[Bf-blender-cvs] [b2d82d096a0] blender2.8: Fix T56706: Lattice crash when enter in edit mode

Clément Foucault noreply at git.blender.org
Thu Sep 6 15:00:47 CEST 2018


Commit: b2d82d096a04c44febdaea6c50fb35858352d46a
Author: Clément Foucault
Date:   Thu Sep 6 14:27:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb2d82d096a04c44febdaea6c50fb35858352d46a

Fix T56706: Lattice crash when enter in edit mode

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

M	source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl

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

diff --git a/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl b/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl
index fba5d604ccf..0cbc66a2b1f 100644
--- a/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_lattice_overlay_loosevert_vert.glsl
@@ -3,7 +3,6 @@
 
 uniform mat4 ModelViewProjectionMatrix;
 uniform vec2 viewportSize;
-uniform ivec4 dataMask = ivec4(0xFF);
 
 in vec3 pos;
 in int data;
@@ -33,7 +32,7 @@ void main()
 	eData1 = eData2 = vec4(1e10);
 	eData2.zw = proj(pPos);
 
-	vertFlag = data & dataMask;
+	vertFlag = data;
 
 	gl_PointSize = sizeVertex;
 	gl_Position = pPos;



More information about the Bf-blender-cvs mailing list