[Bf-blender-cvs] [85d4986b7f4] greasepencil-object: Fix error after merge
Antonio Vazquez
noreply at git.blender.org
Thu Jan 11 12:25:21 CET 2018
Commit: 85d4986b7f4d28bbb06f1fbec174e09aed93f3ce
Author: Antonio Vazquez
Date: Thu Jan 11 12:25:12 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB85d4986b7f4d28bbb06f1fbec174e09aed93f3ce
Fix error after merge
The function name has changed
===================================================================
M source/blender/blenkernel/intern/gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 7e2ca2656aa..8b6b658ebc1 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -2175,7 +2175,7 @@ void BKE_gpencil_move_animdata_to_palettes(bContext *C, bGPdata *gpd)
}
/* create destination action */
- dst_adt->action = add_empty_action(G.main, src_adt->action->id.name + 2);
+ dst_adt->action = BKE_action_add(G.main, src_adt->action->id.name + 2);
/* move fcurves */
action_move_fcurves_by_basepath(src_adt->action, dst_adt->action, "palettes");
More information about the Bf-blender-cvs
mailing list