[Bf-blender-cvs] [6576802f7bc] soc-2021-knife-tools: Merge branch 'master' into soc-2021-knife-tools

[Cian Jinks]

Commit: 6576802f7bc4172c483f10e0322fb269c646a3a7
Author: Cian Jinks
Date:   Wed Jun 23 12:19:49 2021 +0100
Branches: soc-2021-knife-tools
https://developer.blender.org/rB6576802f7bc4172c483f10e0322fb269c646a3a7

Merge branch 'master' into soc-2021-knife-tools

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



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

diff --cc source/blender/editors/mesh/editmesh_knife.c
index a2044d80ff5,2ba1d30900a..8b049ddf039
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@@ -316,12 -267,12 +316,11 @@@ enum 
  /** \name Drawing
   * \{ */
  
 -static void knifetool_draw_angle_snapping(const KnifeTool_OpData *kcd)
 +static void knifetool_raycast_planes(const KnifeTool_OpData *kcd, float r_v1[3], float r_v2[3])
  {
 -  float v1[3], v2[3];
    float planes[4][4];
  
-   planes_from_projmat(
-       (const float(*)[4])kcd->projmat, planes[2], planes[0], planes[3], planes[1], NULL, NULL);
+   planes_from_projmat(kcd->projmat, planes[2], planes[0], planes[1], planes[3], NULL, NULL);
  
    /* ray-cast all planes */
    {