[Bf-blender-cvs] [4aa39919795] soc-2021-knife-tools: Fix: Function parameters changed

Cian Jinks noreply at git.blender.org
Sat Sep 4 15:53:43 CEST 2021


Commit: 4aa39919795ecd68589f9e0ec6be21a2fe4968dc
Author: Cian Jinks
Date:   Sat Sep 4 14:52:48 2021 +0100
Branches: soc-2021-knife-tools
https://developer.blender.org/rB4aa39919795ecd68589f9e0ec6be21a2fe4968dc

Fix: Function parameters changed

The parameters to ED_transform_calc_orientation_from_type_ex needed to be changed after a merge from master.
This fixed axis constraint for the knife tool.

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

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 6ed4f59ab46..5bad09c6e9c 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -3846,7 +3846,7 @@ static void knife_constrain_axis(bContext *C, KnifeTool_OpData *kcd)
   const int pivot_point = scene->toolsettings->transform_pivot_point;
   float mat[3][3];
   ED_transform_calc_orientation_from_type_ex(
-      C, mat, scene, rv3d, ob, obedit, orientation_type, pivot_point);
+      scene, view_layer, kcd->vc.v3d, rv3d, ob, obedit, orientation_type, pivot_point, mat);
 
   /* Apply orientation matrix (can be simplified?). */
   float co[3][3];



More information about the Bf-blender-cvs mailing list