Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-07 19:01:25 +0300
committerBastien Montagne <bastien@blender.org>2020-10-07 19:05:06 +0300
commit253dbe71dcefabc7abfb992d800caa1d963324d1 (patch)
tree6bbfb565734a9fa57bd0d808ac6295dbec9cac24 /source/blender/editors/space_nla/nla_edit.c
parent03ef0cfe3c3327647be5289d8ecddea820401221 (diff)
Refactor: remove `BKE_<id_type>_copy` functions.
Those were only shallow wrappers around `BKE_id_copy`, barely used (even fully unused in some cases), and we want to get rid of those ID-specific helpers for the common ID management tasks. Also prevents weird custom behaviors (like `BKE_object_copy`, who was the only basic ID copy function to reset user count of the new copy to zero). Part of 71219.
Diffstat (limited to 'source/blender/editors/space_nla/nla_edit.c')
-rw-r--r--source/blender/editors/space_nla/nla_edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index dc8f616c5e6..d82a39786d9 100644
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -1928,7 +1928,7 @@ static int nlaedit_make_single_user_exec(bContext *C, wmOperator *UNUSED(op))
/* multi-user? */
if (ID_REAL_USERS(strip->act) > 1) {
/* make a new copy of the action for us to use (it will have 1 user already) */
- bAction *new_action = BKE_action_copy(bmain, strip->act);
+ bAction *new_action = (bAction *)BKE_id_copy(bmain, &strip->act->id);
/* decrement user count of our existing action */
id_us_min(&strip->act->id);
@@ -2029,7 +2029,7 @@ static int nlaedit_apply_scale_exec(bContext *C, wmOperator *UNUSED(op))
}
if (strip->act->id.us > 1) {
/* make a copy of the Action to work on */
- bAction *act = BKE_action_copy(bmain, strip->act);
+ bAction *act = (bAction *)BKE_id_copy(bmain, &strip->act->id);
/* set this as the new referenced action,
* decrementing the users of the old one */