diff options
| author | Martin Felke <martin.felke@googlemail.com> | 2015-11-04 20:01:12 +0300 |
|---|---|---|
| committer | Martin Felke <martin.felke@googlemail.com> | 2015-11-04 20:01:12 +0300 |
| commit | e141527ddb1586aa5ca3c92ee0b2dbd47a1521bc (patch) | |
| tree | b10bef682ae1257f8d036e7b36e1ee7f54b3d110 /source/blender/editors/include/ED_anim_api.h | |
| parent | 0076ba4833c7a6f60459674aad03b646ebd00690 (diff) | |
| parent | f337feaf5a1d727cb9f93634e58fcef5b374bade (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/blender-v2.76-release' into fracture_modifier
Conflicts:
release/scripts/addons
source/blender/windowmanager/intern/wm_operators.c
Diffstat (limited to 'source/blender/editors/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 37d9b62d3da..687dcfcbb3b 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -683,7 +683,9 @@ void ED_operatormacros_action(void); /* Action Editor - Action Management */ struct AnimData *ED_actedit_animdata_from_context(struct bContext *C); -void ED_animedit_unlink_action(struct bContext *C, struct ID *id, struct AnimData *adt, struct bAction *act, struct ReportList *reports); +void ED_animedit_unlink_action(struct bContext *C, struct ID *id, + struct AnimData *adt, struct bAction *act, + struct ReportList *reports, bool force_delete); /* ************************************************ */ |