[Bf-blender-cvs] [bd6d0b94bc1] blender2.8: Fix T55744: Assertion failure using the Knife angle constraint option

Clément Foucault noreply at git.blender.org
Fri Jul 27 12:17:47 CEST 2018


Commit: bd6d0b94bc17bd0e1a2a89210732a207a0e2b7d7
Author: Clément Foucault
Date:   Fri Jul 27 12:15:39 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbd6d0b94bc17bd0e1a2a89210732a207a0e2b7d7

Fix T55744: Assertion failure using the Knife angle constraint option

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

M	source/blender/editors/mesh/editmesh_knife.c

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

diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 99756269c1f..61f55451b17 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -1048,14 +1048,15 @@ static void knifetool_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void
 	GPU_matrix_push();
 	GPU_matrix_mul(kcd->ob->obmat);
 
+	if (kcd->mode == MODE_DRAGGING && kcd->is_angle_snapping) {
+		knifetool_draw_angle_snapping(kcd);
+	}
+
 	uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
 
 	immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 
 	if (kcd->mode == MODE_DRAGGING) {
-		if (kcd->is_angle_snapping)
-			knifetool_draw_angle_snapping(kcd);
-
 		immUniformColor3ubv(kcd->colors.line);
 		GPU_line_width(2.0);



More information about the Bf-blender-cvs mailing list