[Bf-blender-cvs] [dcf1a1045df] master: Cleanup: move some headers from MOD_lineart.h to source files

Campbell Barton noreply at git.blender.org
Sun Mar 21 04:53:02 CET 2021


Commit: dcf1a1045dfee527bd691113385cfa61df1499fe
Author: Campbell Barton
Date:   Sun Mar 21 14:50:58 2021 +1100
Branches: master
https://developer.blender.org/rBdcf1a1045dfee527bd691113385cfa61df1499fe

Cleanup: move some headers from MOD_lineart.h to source files

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

M	source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_util.c

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

diff --git a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index e9fe910dfed..148bbc2c146 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@ -23,15 +23,11 @@
 
 #pragma once
 
-#include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math.h"
+#include "BLI_math.h" /* Needed here for inline functions. */
 #include "BLI_threads.h"
 
-#include "DNA_lineart_types.h"
-
 #include <math.h>
-#include <string.h>
 
 typedef struct LineartStaticMemPoolNode {
   Link item;
@@ -569,6 +565,4 @@ void MOD_lineart_gpencil_generate(LineartRenderBuffer *rb,
 
 float MOD_lineart_chain_compute_length(LineartLineChain *rlc);
 
-struct wmOperatorType;
-
 void ED_operatortypes_lineart(void);
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 7d281cc3151..552e474846c 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -25,7 +25,7 @@
 
 #include "BLI_linklist.h"
 #include "BLI_listbase.h"
-#include "BLI_math_matrix.h"
+#include "BLI_math.h"
 #include "BLI_task.h"
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 5b439670a73..8c16dbdb25a 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -25,6 +25,10 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_linklist.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
@@ -34,8 +38,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "BLI_utildefines.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
index b38124fc7a5..fc96b8dc087 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
@@ -24,9 +24,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 /* #include <time.h> */
+
+#include <math.h>
+
 #include "MEM_guardedalloc.h"
+
 #include "MOD_lineart.h"
-#include <math.h>
+
+#include "BLI_math.h"
 
 #include "lineart_intern.h"



More information about the Bf-blender-cvs mailing list