[Bf-blender-cvs] [3dbdf69b585] temp-lineart-contained: LineArt: cleanup unnecessary includes.

[YimingWu]

Commit: 3dbdf69b585aeeae634e508dcf2cc58291041bf4
Author: YimingWu
Date:   Fri Nov 13 10:33:54 2020 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB3dbdf69b585aeeae634e508dcf2cc58291041bf4

LineArt: cleanup unnecessary includes.

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/versioning_290.c
M	source/blender/blenloader/intern/writefile.c
M	source/blender/draw/DRW_engine.h
M	source/blender/makesdna/DNA_scene_defaults.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b1596ded05d..2c10dd446f1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -49,7 +49,6 @@
 #include "DNA_genfile.h"
 #include "DNA_key_types.h"
 #include "DNA_layer_types.h"
-#include "DNA_lineart_types.h"
 #include "DNA_node_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_sdna_types.h"
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 471cecce7a3..fab4ce6727f 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1138,5 +1138,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
    * \note Keep this message at the bottom of the function.
    */
   {
+    /* Keep this block, even when empty. */
   }
 }
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 86f069622ce..11fe240620a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -94,7 +94,6 @@
 #define DNA_DEPRECATED_ALLOW
 
 #include "DNA_fileglobal_types.h"
-#include "DNA_lineart_types.h"
 #include "DNA_genfile.h"
 #include "DNA_sdna_types.h"
 
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index da112565867..2d5b93f4272 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -138,11 +138,6 @@ void DRW_draw_select_id(struct Depsgraph *depsgraph,
 bool DRW_render_check_grease_pencil(struct Depsgraph *depsgraph);
 void DRW_render_gpencil(struct RenderEngine *engine, struct Depsgraph *depsgraph);
 
-/* Line Art calls */
-#ifdef WITH_LINEART
-void DRW_scene_lineart_freecache(struct Scene *sce);
-#endif
-
 /* This is here because GPUViewport needs it */
 struct DRWInstanceDataList *DRW_instance_data_list_create(void);
 void DRW_instance_data_list_free(struct DRWInstanceDataList *idatalist);
diff --git a/source/blender/makesdna/DNA_scene_defaults.h b/source/blender/makesdna/DNA_scene_defaults.h
index 40a52a51fee..ae02ac5ee35 100644
--- a/source/blender/makesdna/DNA_scene_defaults.h
+++ b/source/blender/makesdna/DNA_scene_defaults.h
@@ -235,7 +235,6 @@
                     SCE_EEVEE_GTAO_BOUNCE | SCE_EEVEE_TAA_REPROJECTION | \
                     SCE_EEVEE_SSR_HALF_RESOLUTION | SCE_EEVEE_SHADOW_SOFT, \
   }
-  
 
 #define _DNA_DEFAULT_Scene \
   { \
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 99efc3efea8..c132c434468 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -24,7 +24,6 @@
 #include "DNA_collection_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_layer_types.h"
-#include "DNA_lineart_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_particle_types.h"