[Bf-blender-cvs] [a26bfa7d633] temp-greasepencil-object-stacksplit: Fix building of gpencil_data.c

Dalai Felinto noreply at git.blender.org
Mon Jun 18 15:22:44 CEST 2018


Commit: a26bfa7d63307df8a75baa0acbe04919f007e4a5
Author: Dalai Felinto
Date:   Mon Jun 18 15:22:40 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rBa26bfa7d63307df8a75baa0acbe04919f007e4a5

Fix building of gpencil_data.c

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

M	source/blender/editors/gpencil/gpencil_data.c

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

diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 93cffaf0fec..71576e28a12 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -65,6 +65,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
+#include "BKE_gpencil_modifier.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
@@ -1802,8 +1803,8 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op)
 				bGPdata *gpd_src = base->object->data;
 
 				/* Apply all GP modifiers before */
-				for (ModifierData *md = base->object->modifiers.first; md; md = md->next) {
-					const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+				for (GreasePencilModifierData *md = base->object->greasepencil_modifiers.first; md; md = md->next) {
+					const GreasePencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
 					if (mti->gp_bakeModifier) {
 						mti->gp_bakeModifier(bmain, depsgraph, md, base->object);
 					}



More information about the Bf-blender-cvs mailing list