[Bf-blender-cvs] [3f76836e72f] lanpr-under-gp: LineArt: Mac compatibility.

YimingWu noreply at git.blender.org
Fri Sep 18 08:00:31 CEST 2020


Commit: 3f76836e72ff371f9e6769f3d02015f485649970
Author: YimingWu
Date:   Fri Sep 18 14:00:09 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB3f76836e72ff371f9e6769f3d02015f485649970

LineArt: Mac compatibility.

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

M	source/blender/CMakeLists.txt
M	source/blender/makesdna/DNA_collection_types.h
M	source/blender/makesdna/DNA_lineart_types.h

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

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index d4f71c5b423..24cfa3414e0 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -53,6 +53,7 @@ set(SRC_DNA_INC
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_layer_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_light_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_types.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lineart_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
   ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index a5e71fa5fc0..0696a3dfb96 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -27,7 +27,6 @@
 
 #include "DNA_ID.h"
 #include "DNA_defs.h"
-#include "DNA_lineart_types.h"
 #include "DNA_listBase.h"
 
 struct Collection;
diff --git a/source/blender/makesdna/DNA_lineart_types.h b/source/blender/makesdna/DNA_lineart_types.h
index 650d6469255..46bfdf15c6a 100644
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@ -33,12 +33,10 @@
  */
 
 #include "DNA_ID.h"
-#include "DNA_collection_types.h"
 #include "DNA_listBase.h"
 
 struct Object;
 struct Material;
-struct Collection;
 
 /* Notice that we need to have this file although no struct defines.
  * Edge flags and usage flags are used by with scene/object/gpencil modifier bits, and those values



More information about the Bf-blender-cvs mailing list