[Bf-blender-cvs] [eb65d5fb098] temp-lineart-contained: Fix building with and without WITH_LINEART

[Sebastian Parborg]

Commit: eb65d5fb09868b3dbcf5a7bffc3e07f8979aa476
Author: Sebastian Parborg
Date:   Thu Jan 14 21:28:06 2021 +0100
Branches: temp-lineart-contained
https://developer.blender.org/rBeb65d5fb09868b3dbcf5a7bffc3e07f8979aa476

Fix building with and without WITH_LINEART

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

M	source/blender/gpencil_modifiers/CMakeLists.txt
M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/rna_material.c

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

diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index d5ae16623e7..81c63199588 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -22,7 +22,6 @@
 set(INC
   .
   intern
-  intern/lineart
   ../blenfont
   ../blenkernel
   ../blenlib
@@ -84,6 +83,12 @@ endif()
 if(WITH_LINEART)
   add_definitions(-DWITH_LINEART)
   add_subdirectory(intern/lineart)
+  list(APPEND INC
+    intern/lineart
+  )
+  list(APPEND LIB
+    bf_gpencil_lineart
+  )
 endif()
 
 add_definitions(${GL_DEFINITIONS})
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 20751e49b8d..3a376438dfb 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -38,7 +38,9 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
-#include "ED_lineart.h"
+#ifdef WITH_LINEART
+#  include "ED_lineart.h"
+#endif
 
 #include "BKE_collection.h"
 #include "BKE_context.h"
@@ -63,8 +65,6 @@
 #include "MOD_gpencil_ui_common.h"
 #include "MOD_gpencil_util.h"
 
-#include "ED_lineart.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -87,6 +87,7 @@ static void copyData(const GpencilModifierData *md, GpencilModifierData *target)
   BKE_gpencil_modifier_copydata_generic(md, target);
 }
 
+#ifdef WITH_LINEART
 static void generate_strokes_actual(
     GpencilModifierData *md, Depsgraph *depsgraph, Object *ob, bGPDlayer *gpl, bGPDframe *gpf)
 {
@@ -118,9 +119,11 @@ static void generate_strokes_actual(
       lmd->vgname,
       lmd->flags);
 }
+#endif
 
 static bool isModifierDisabled(GpencilModifierData *md)
 {
+#ifdef WITH_LINEART
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
 
   if ((lmd->target_layer[0] == '\0') || (lmd->target_material == NULL)) {
@@ -136,6 +139,10 @@ static bool isModifierDisabled(GpencilModifierData *md)
   }
 
   return false;
+#else
+  UNUSED_VARS(md);
+  return true;
+#endif
 }
 static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Object *ob)
 {
@@ -161,6 +168,7 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec
     return;
   }
 
+#ifdef WITH_LINEART
   ED_lineart_compute_feature_lines_internal(depsgraph, lmd);
 
   generate_strokes_actual(md, depsgraph, ob, gpl, gpf);
@@ -168,6 +176,7 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec
   ED_lineart_destroy_render_data(lmd);
 
   WM_main_add_notifier(NA_EDITED | NC_GPENCIL, NULL);
+#endif
 }
 
 static void bakeModifier(Main *UNUSED(bmain),
@@ -175,7 +184,7 @@ static void bakeModifier(Main *UNUSED(bmain),
                          GpencilModifierData *md,
                          Object *ob)
 {
-
+#ifdef WITH_LINEART
   bGPdata *gpd = ob->data;
   LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
 
@@ -193,6 +202,9 @@ static void bakeModifier(Main *UNUSED(bmain),
   generate_strokes_actual(md, depsgraph, ob, gpl, gpf);
 
   ED_lineart_destroy_render_data(lmd);
+#else
+  UNUSED_VARS(depsgraph, md, ob);
+#endif
 }
 
 static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 9fc02e8405d..a697b4eb396 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -334,6 +334,9 @@ endif()
 
 if(WITH_LINEART)
   add_definitions(-DWITH_LINEART)
+  list(APPEND INC
+  ../../gpencil_modifiers/intern/lineart
+  )
 endif()
 
 if(WITH_OPENSUBDIV)
@@ -384,7 +387,6 @@ blender_include_dirs(
   ../../simulation
   ../../windowmanager
   ../../editors/include
-  ../../gpencil_modifiers/intern/lineart
   ../../render
   ../../../../intern/cycles/blender
   ../../../../intern/atomic
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 8cf73e8c5eb..660a4be73d7 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -87,7 +87,6 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
 
 #  include "ED_gpencil.h"
 #  include "ED_image.h"
-#  include "ED_lineart.h"
 #  include "ED_node.h"
 #  include "ED_screen.h"