diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 15:55:29 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 22:58:53 +0300 |
| commit | 4779165ca18ae3ced005aad129575b70fc6c4f9d (patch) | |
| tree | d1e70f122a31b87ac0137074aa1d561dc3bf1329 /source/blender/editors/gpencil/gpencil_data.c | |
| parent | a0d8e52b54ea9c27b47ddf96ff51cc934534d40e (diff) | |
Fix dpesgraph wrongly refcounting NLA strip actions when duplicating IDs.
NLA strips are users of their action, so we need to pass along ID
management flags.
This commit also cleans up a bit things by passing along ID_CREATE/COPY
flags instead of dummy booleans...
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_data.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index a9cd868aff3..40cff866ffe 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -2122,7 +2122,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op) if (ob_iter->adt) { if (ob_active->adt == NULL) { /* no animdata, so just use a copy of the whole thing */ - ob_active->adt = BKE_animdata_copy(bmain, ob_iter->adt, false, true); + ob_active->adt = BKE_animdata_copy(bmain, ob_iter->adt, 0); } else { /* merge in data - we'll fix the drivers manually */ @@ -2133,7 +2133,7 @@ int ED_gpencil_join_objects_exec(bContext *C, wmOperator *op) if (gpd_src->adt) { if (gpd_dst->adt == NULL) { /* no animdata, so just use a copy of the whole thing */ - gpd_dst->adt = BKE_animdata_copy(bmain, gpd_src->adt, false, true); + gpd_dst->adt = BKE_animdata_copy(bmain, gpd_src->adt, 0); } else { /* merge in data - we'll fix the drivers manually */ |