Commit: e6e7ba4a089f4893efdaa9eae6a91368b0605d7b
Author: Antonio Vazquez
Date: Thu Dec 21 17:59:16 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe6e7ba4a089f4893efdaa9eae6a91368b0605d7b
Apply all modifiers first
The previous commit was the Context missing as parameter and this was the
reason of the errors
===================================================================
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 fd6b4cff7cc..182d4ab4c1a 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -1938,16 +1938,14 @@ int ED_gpencil_join_objects_exec(bContext *C,
wmOperator *op)
if (obact->data != base->object->data) {
bGPdata *gpd = base->object->data;
-#if 0 /* not implemented yet */
- /* Apply all GP modifiers */
+ /* Apply all GP modifiers before */
for (ModifierData *md =
base->object->modifiers.first; md; md = md->next) {
const ModifierTypeInfo *mti =
modifierType_getInfo(md->type);
if (mti->bakeModifierGP) {
- mti->bakeModifierGP(NULL,
bmain->eval_ctx, md, base->object);
+ mti->bakeModifierGP(C,
bmain->eval_ctx, md, base->object);
}
}
-#endif
/* copy vertex groups to the base one's */
int old_idx = 0;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
