[Bf-blender-cvs] [32bab9cf9e2] greasepencil-object: GPencil: Fix merge problems

[Antonio Vazquez]

Commit: 32bab9cf9e2e6c9b99e73a30338a2d881b081619
Author: Antonio Vazquez
Date:   Fri Dec 18 19:01:20 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB32bab9cf9e2e6c9b99e73a30338a2d881b081619

GPencil: Fix merge problems

There were some changes in the include files

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

M	source/blender/io/gpencil/intern/gpencil_io_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_import_base.cc

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 090fc696e06..588ee22847a 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -36,7 +36,11 @@
 #include "BLI_math.h"
 
 #include "DNA_gpencil_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_material_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_view3d_types.h"
 
 #include "UI_view2d.h"
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
index bc96203e50f..b15ac426510 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
@@ -41,6 +41,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
 #include "UI_view2d.h"