From 0544934070e9df8a932da06d77c46a14efcd2766 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Wed, 26 Jul 2017 20:39:29 -0700
Subject: [PATCH] Fixed merge issue.

---
 src/Mod/Path/PathScripts/PathUtils.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py
index 3ad1593ef0..ac9f873dde 100644
--- a/src/Mod/Path/PathScripts/PathUtils.py
+++ b/src/Mod/Path/PathScripts/PathUtils.py
@@ -745,6 +745,13 @@ def guessDepths(objshape, subs=None):
 
     return depth_params(clearance, safe, start, 1.0, 0.0, final, user_depths=None, equalstep=False)
 
+def drillTipLength(tool):
+    """returns the length of the drillbit tip."""
+    if tool.CuttingEdgeAngle == 0.0 or tool.Diameter == 0.0:
+        return 0.0
+    else:
+        theta = math.radians(tool.CuttingEdgeAngle)
+        return (tool.Diameter/2) / math.tan(theta) 
 
 class depth_params:
     '''calculates the intermediate depth values for various operations given the starting, ending, and stepdown parameters