[Bf-blender-cvs] [41dbaa4aee9] tmp-overlay-engine: Fix crash caused by copy pasting!
Clément Foucault
noreply at git.blender.org
Tue Nov 26 13:06:44 CET 2019
Commit: 41dbaa4aee9013467a9a607b1ca929cbf5114735
Author: Clément Foucault
Date: Tue Nov 26 13:34:10 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rB41dbaa4aee9013467a9a607b1ca929cbf5114735
Fix crash caused by copy pasting!
===================================================================
M source/blender/draw/engines/overlay/shaders/edit_mesh_geom.glsl
M source/blender/draw/engines/overlay/shaders/wireframe_geom.glsl
===================================================================
diff --git a/source/blender/draw/engines/overlay/shaders/edit_mesh_geom.glsl b/source/blender/draw/engines/overlay/shaders/edit_mesh_geom.glsl
index 46a3de93c70..92252bbd223 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_mesh_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_mesh_geom.glsl
@@ -64,7 +64,7 @@ void main()
half_size += 0.5;
#endif
- vec3 edge_ofs = vec3(halfsize * sizeViewportInv.xy, 0.0);
+ vec3 edge_ofs = vec3(half_size * sizeViewportInv.xy, 0.0);
bool horizontal = line.x > line.y;
edge_ofs = (horizontal) ? edge_ofs.zyz : edge_ofs.xzz;
diff --git a/source/blender/draw/engines/overlay/shaders/wireframe_geom.glsl b/source/blender/draw/engines/overlay/shaders/wireframe_geom.glsl
index 590a556cc93..0cb06df0108 100644
--- a/source/blender/draw/engines/overlay/shaders/wireframe_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/wireframe_geom.glsl
@@ -38,7 +38,7 @@ void main()
float half_size = sizePixel * 0.5;
- vec3 edge_ofs = vec3(halfsize * sizeViewportInv.xy, 0.0);
+ vec3 edge_ofs = vec3(half_size * sizeViewportInv.xy, 0.0);
bool horizontal = line.x > line.y;
edge_ofs = (horizontal) ? edge_ofs.zyz : edge_ofs.xzz;
More information about the Bf-blender-cvs
mailing list