[Bf-blender-cvs] [efe3a13b55c] master: Cleanup: Removed redundant if macro

Cian Jinks noreply at git.blender.org
Tue Sep 28 22:58:50 CEST 2021


Commit: efe3a13b55c0295b68697c19e4379b5bbe8684ca
Author: Cian Jinks
Date:   Tue Sep 28 21:57:42 2021 +0100
Branches: master
https://developer.blender.org/rBefe3a13b55c0295b68697c19e4379b5bbe8684ca

Cleanup: Removed redundant if macro

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

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 eaecda28287..4fa8df0b672 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -369,7 +369,6 @@ enum {
 /** \name Drawing
  * \{ */
 
-#if 1
 static void knifetool_raycast_planes(const KnifeTool_OpData *kcd, float r_v1[3], float r_v2[3])
 {
   float planes[4][4];
@@ -383,10 +382,6 @@ static void knifetool_raycast_planes(const KnifeTool_OpData *kcd, float r_v1[3],
     float lambda_best[2] = {-FLT_MAX, FLT_MAX};
     int i;
 
-    /* We (sometimes) need the lines to be at the same depth before projecting. */
-#  if 0
-    sub_v3_v3v3(ray_dir, kcd->curr.cage, kcd->prev.cage);
-#  else
     {
       float curr_cage_adjust[3];
       float co_depth[3];
@@ -396,7 +391,6 @@ static void knifetool_raycast_planes(const KnifeTool_OpData *kcd, float r_v1[3],
 
       sub_v3_v3v3(ray_dir, curr_cage_adjust, kcd->prev.cage);
     }
-#  endif
 
     for (i = 0; i < 4; i++) {
       float ray_hit[3];
@@ -483,7 +477,6 @@ static void knifetool_draw_orientation_locking(const KnifeTool_OpData *kcd)
     immUnbindProgram();
   }
 }
-#endif
 
 static void knifetool_draw_visible_distances(const KnifeTool_OpData *kcd)
 {



More information about the Bf-blender-cvs mailing list