[Bf-blender-cvs] [feb24c13b94] soc-2018-npr: Fix accidental merge error

[Yiming Wu]

Commit: feb24c13b942f2500dfc4ca4aa4dc98474f651c0
Author: Yiming Wu
Date:   Fri Dec 14 14:46:43 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBfeb24c13b942f2500dfc4ca4aa4dc98474f651c0

Fix accidental merge error

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

M	source/blender/draw/engines/lanpr/lanpr_ops.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 9baa3bab59d..8eeb9ce78c4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -1023,7 +1023,7 @@ int lanpr_point_inside_triangle3d(tnsVector3d v, tnsVector3d v0, tnsVector3d v1,
 
 	return 1;
 }
-int lan版本pr_point_inside_triangle3de(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2) {
+int lanpr_point_inside_triangle3de(tnsVector3d v, tnsVector3d v0, tnsVector3d v1, tnsVector3d v2) {
 	tnsVector3d L, R;
 	tnsVector3d N1, N2;
 	real d;