[Bf-blender-cvs] [96339b8ea47] soc-2019-npr: LANPR: Moved lanpr_util.c into ED.

[YimingWu]

Commit: 96339b8ea47de96dda3b2f6867cc2c249d8d0546
Author: YimingWu
Date:   Sat Jul 13 17:35:07 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB96339b8ea47de96dda3b2f6867cc2c249d8d0546

LANPR: Moved lanpr_util.c into ED.

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

M       source/blender/draw/CMakeLists.txt
M       source/blender/editors/lanpr/CMakeLists.txt
R099    source/blender/draw/engines/lanpr/lanpr_util.c  
source/blender/editors/lanpr/lanpr_util.c

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

diff --git a/source/blender/draw/CMakeLists.txt 
b/source/blender/draw/CMakeLists.txt
index b4ebff62668..3c08c17a7ce 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -130,7 +130,6 @@ set(SRC
        engines/lanpr/lanpr_engine.c
        engines/lanpr/lanpr_snake.c
        engines/lanpr/lanpr_ops.c
-       engines/lanpr/lanpr_util.c
   engines/lanpr/lanpr_chain_draw.c
   engines/lanpr/lanpr_access.c
 
diff --git a/source/blender/editors/lanpr/CMakeLists.txt 
b/source/blender/editors/lanpr/CMakeLists.txt
index 1108e82321e..44a8d294ff7 100644
--- a/source/blender/editors/lanpr/CMakeLists.txt
+++ b/source/blender/editors/lanpr/CMakeLists.txt
@@ -34,6 +34,7 @@ set(INC_SYS
 set(SRC
   lanpr_ops.c
   lanpr_chain.c
+  lanpr_util.c
 )
 
 set(LIB
diff --git a/source/blender/draw/engines/lanpr/lanpr_util.c 
b/source/blender/editors/lanpr/lanpr_util.c
similarity index 99%
rename from source/blender/draw/engines/lanpr/lanpr_util.c
rename to source/blender/editors/lanpr/lanpr_util.c
index 332eabf76fc..5add71c260d 100644
--- a/source/blender/draw/engines/lanpr/lanpr_util.c
+++ b/source/blender/editors/lanpr/lanpr_util.c
@@ -1,16 +1,9 @@
-/*
-
-   Ported from NUL4.0
-
-   Author(s):WuYiming - xp8...@outlook.com
-
- */
 #define _CRT_SEQURE_NO_WARNINGS
 #include <stdlib.h>
 #include <stdio.h>
 /* #include <time.h> */
 #include "ED_lanpr.h"
-#include "lanpr_all.h"
+#include "MEM_guardedalloc.h"
 #include <math.h>
 
 /* ===================================================================[slt] */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs