[Bf-blender-cvs] [c2f0ee013bd] lanpr-under-gp: LineArt: Merge changes

YimingWu noreply at git.blender.org
Sat Dec 19 05:48:13 CET 2020


Commit: c2f0ee013bd892f4572d680d11bc50d5fed8edaf
Author: YimingWu
Date:   Sat Dec 19 12:47:59 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBc2f0ee013bd892f4572d680d11bc50d5fed8edaf

LineArt: Merge changes

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

M	source/blender/editors/gpencil/gpencil_add_lineart.c
M	source/blender/editors/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/source/blender/editors/gpencil/gpencil_add_lineart.c b/source/blender/editors/gpencil/gpencil_add_lineart.c
index 7cbaa6ef2d5..71253635ea8 100644
--- a/source/blender/editors/gpencil/gpencil_add_lineart.c
+++ b/source/blender/editors/gpencil/gpencil_add_lineart.c
@@ -25,6 +25,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_gpencil_types.h"
+#include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/editors/lineart/lineart_cpu.c b/source/blender/editors/lineart/lineart_cpu.c
index 6bf359ea7f9..b84bac0e530 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -50,8 +50,10 @@
 #include "BKE_text.h"
 #include "DEG_depsgraph_query.h"
 #include "DNA_camera_types.h"
+#include "DNA_collection_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_lineart_types.h"
+#include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 487802e4a80..6f2c6d12edc 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -30,6 +30,7 @@
 
 #include "BLT_translation.h"
 
+#include "DNA_collection_types.h"
 #include "DNA_gpencil_modifier_types.h"
 #include "DNA_gpencil_types.h"
 #include "DNA_lineart_types.h"



More information about the Bf-blender-cvs mailing list