[Bf-blender-cvs] [257742dd5db] temp_lineart_contained: LineArt: Move files to gpencil modifier folder.

[YimingWu]

Commit: 257742dd5dbd176a3638cf0f164d032b037f8c97
Author: YimingWu
Date:   Thu Nov 12 10:35:34 2020 +0800
Branches: temp_lineart_contained
https://developer.blender.org/rB257742dd5dbd176a3638cf0f164d032b037f8c97

LineArt: Move files to gpencil modifier folder.

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

M	source/blender/editors/CMakeLists.txt
M	source/blender/gpencil_modifiers/CMakeLists.txt
R098	source/blender/editors/lineart/CMakeLists.txt	source/blender/gpencil_modifiers/intern/lineart/CMakeLists.txt
R100	source/blender/editors/lineart/lineart_chain.c	source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
R100	source/blender/editors/lineart/lineart_cpu.c	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
R100	source/blender/editors/lineart/lineart_intern.h	source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
R100	source/blender/editors/lineart/lineart_ops.c	source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
R100	source/blender/editors/lineart/lineart_util.c	source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
M	source/blender/makesdna/DNA_gpencil_modifier_types.h
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 593df600283..a527681474e 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -68,5 +68,4 @@ add_subdirectory(datafiles)
 
 if(WITH_LINEART)
   add_definitions(-DWITH_LINEART)
-  add_subdirectory(lineart)
 endif()
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index f9cc7737f19..e0cbc472f2e 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -82,6 +82,7 @@ endif()
 
 if(WITH_LINEART)
   add_definitions(-DWITH_LINEART)
+  add_subdirectory(lineart)
 endif()
 
 add_definitions(${GL_DEFINITIONS})
diff --git a/source/blender/editors/lineart/CMakeLists.txt b/source/blender/gpencil_modifiers/intern/lineart/CMakeLists.txt
similarity index 98%
rename from source/blender/editors/lineart/CMakeLists.txt
rename to source/blender/gpencil_modifiers/intern/lineart/CMakeLists.txt
index d8c5ab1d77f..26a71e9dc61 100644
--- a/source/blender/editors/lineart/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/intern/lineart/CMakeLists.txt
@@ -16,7 +16,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-  ../include
   ../../blenkernel
   ../../blenlib
   ../../bmesh
diff --git a/source/blender/editors/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
similarity index 100%
rename from source/blender/editors/lineart/lineart_chain.c
rename to source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
similarity index 100%
rename from source/blender/editors/lineart/lineart_cpu.c
rename to source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
diff --git a/source/blender/editors/lineart/lineart_intern.h b/source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
similarity index 100%
rename from source/blender/editors/lineart/lineart_intern.h
rename to source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
diff --git a/source/blender/editors/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
similarity index 100%
rename from source/blender/editors/lineart/lineart_ops.c
rename to source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
diff --git a/source/blender/editors/lineart/lineart_util.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
similarity index 100%
rename from source/blender/editors/lineart/lineart_util.c
rename to source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index e6ddf93cd6a..299b4f150d5 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -827,6 +827,16 @@ typedef struct LineartGpencilModifierData {
 
   short line_types; /* line type enable flags, bits in eLineartEdgeFlag */
 
+  /** 0-1 range for cosine angle */
+  float crease_threshold;
+
+  /**  0-PI angle, for splitting strokes at sharp points */
+  float angle_splitting_threshold;
+
+  /* CPU mode */
+  float chaining_geometry_threshold;
+  float chaining_image_threshold;
+
   char source_type; /* Object or Collection, from eLineartGpencilModifierSource */
 
   char use_multiple_levels;
@@ -852,7 +862,10 @@ typedef struct LineartGpencilModifierData {
 
   float pre_sample_length;
 
-  /* Additional Switches */
+  /* Ported from SceneLineArt flags. */
+  int calculation_flags;
+
+  /* Additional Switches. */
   int flags;
 
 } LineartGpencilModifierData;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f91bdd50aa6..a955cfd6825 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1697,16 +1697,6 @@ typedef struct SceneLineArt {
   /** Reserved for suggestive contour */
   float contour_fade;
 
-  /** 0-1 range for cosine angle */
-  float crease_threshold;
-
-  /**  0-PI angle, for splitting strokes at sharp points */
-  float angle_splitting_threshold;
-
-  /* CPU mode */
-  float chaining_geometry_threshold;
-  float chaining_image_threshold;
-
   /* Baking */
   int baking_preview_start;
   int baking_preview_end;