[Bf-blender-cvs] [1c2cda87b15] soc-2019-npr: temporally add draw lib to gpencil modifier for lanpr

Yiming Wu noreply at git.blender.org
Thu May 30 13:22:04 CEST 2019


Commit: 1c2cda87b151eb3df22202d98e3e024bb080773e
Author: Yiming Wu
Date:   Thu May 30 16:11:46 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB1c2cda87b151eb3df22202d98e3e024bb080773e

temporally add draw lib to gpencil modifier for lanpr

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

M	source/blender/draw/engines/lanpr/lanpr_access.h
M	source/blender/draw/engines/lanpr/lanpr_data_types.h
M	source/blender/gpencil_modifiers/CMakeLists.txt
M	source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index ef9cdb1d22f..755c57c67a2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -4,10 +4,12 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_gpencil_modifier_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BKE_gpencil.h"
 
 void lanpr_generate_gpencil_geometry(
         GpencilModifierData *md, Depsgraph *depsgraph,
         Object *ob, bGPDlayer *gpl, bGPDframe *gpf);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/draw/engines/lanpr/lanpr_data_types.h b/source/blender/draw/engines/lanpr/lanpr_data_types.h
index 5ccb31f4350..e9d78ef557e 100644
--- a/source/blender/draw/engines/lanpr/lanpr_data_types.h
+++ b/source/blender/draw/engines/lanpr/lanpr_data_types.h
@@ -1,3 +1,5 @@
+#ifndef __LANPR_DATA_TYPES_H__
+#define __LANPR_DATA_TYPES_H__
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -130,3 +132,5 @@ typedef struct LANPR_RenderLineChainItem {
 } LANPR_RenderLineChainItem;
 
 
+
+#endif
\ No newline at end of file
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index 5fc12486aa8..6f0468426ac 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -67,6 +67,7 @@ set(SRC
 )
 
 set(LIB
+  bf_draw
 )
 
 if(WITH_INTERNATIONAL)
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c
index f1e83fb23c7..4b8b3595c19 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilstroke.c
@@ -150,4 +150,5 @@ GpencilModifierTypeInfo modifierType_Gpencil_Stroke = {
 	/* foreachObjectLink */ foreachObjectLink,
 	/* foreachIDLink */     NULL,
 	/* foreachTexLink */    NULL,
+	/* getDuplicationFactor */ NULL,
 };



More information about the Bf-blender-cvs mailing list