blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

Animation: Paste Keys in Graph Editor with value offset #104512

Merged
Christoph Lendenfeld merged 12 commits from ChrisLend/blender:copy_paste_frame_range into main 2023-02-23 09:47:00 +01:00
Conversation 2 Commits 12 Files Changed 5 +16 -20
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f0fa2eca0e - Show all commits

36
source/blender/editors/animation/keyframes_general.c
View File

@ -1134,13 +1134,9 @@ static void paste_animedit_keys_fcurve(
do_curve_mirror_flippping(aci, bezt);
}
bezt->vec[0][0] += offset[0];
bezt->vec[1][0] += offset[0];
bezt->vec[2][0] += offset[0];
bezt->vec[0][1] += offset[1];
bezt->vec[1][1] += offset[1];
bezt->vec[2][1] += offset[1];
add_v2_v2(bezt->vec[0], offset);
add_v2_v2(bezt->vec[1], offset);
add_v2_v2(bezt->vec[2], offset);
/* insert the keyframe
* NOTE: we do not want to inherit handles from existing keyframes in this case!
@ -1149,13 +1145,9 @@ static void paste_animedit_keys_fcurve(
insert_bezt_fcurve(fcu, bezt, INSERTKEY_OVERWRITE_FULL);
/* un-apply offset from src beztriple after copying */
bezt->vec[0][0] -= offset[0];
bezt->vec[1][0] -= offset[0];
bezt->vec[2][0] -= offset[0];
bezt->vec[0][1] -= offset[1];
bezt->vec[1][1] -= offset[1];
bezt->vec[2][1] -= offset[1];
sub_v2_v2(bezt->vec[0], offset);
sub_v2_v2(bezt->vec[1], offset);
sub_v2_v2(bezt->vec[2], offset);
if (flip) {
do_curve_mirror_flippping(aci, bezt);
@ -1239,33 +1231,37 @@ static float paste_get_y_offset(bAnimContext *ac,
case KEYFRAME_PASTE_VALUE_OFFSET_CURSOR:
SpaceGraph *sipo = (SpaceGraph *)ac->sl;
offset = sipo->cursorVal - aci->bezt[0].vec[1][1];
break;
return offset;
dr.sybren marked this conversation as resolved
Sybren A. Stüvel commented 2023-02-14 17:32:04 +01:00
Review
Copy Link

Instead of having a variable offset, and having to track how it's changed in the code below, IMO it's better to just replace this

offset = ...;
break;

with

return ...;
Instead of having a variable `offset`, and having to track how it's changed in the code below, IMO it's better to just replace this ```c offset = ...; break; ``` with ```c return ...; ```
Sybren A. Stüvel commented 2023-02-17 15:12:53 +01:00
Review
Copy Link

With this change, you don't even need the top-level variable float offset any more. If you want to keep a variable between the calculation and the return (can aid in debugging the code), use a const float offset = ... constant scoped to the case statement instead. Or just return sipo->cursorVal - aci->bezt[0].vec[1][1]; if you don't need the extra variable.

With this change, you don't even need the top-level variable `float offset` any more. If you want to keep a variable between the calculation and the `return` (can aid in debugging the code), use a `const float offset = ...` constant scoped to the `case` statement instead. Or just `return sipo->cursorVal - aci->bezt[0].vec[1][1];` if you don't need the extra variable.
case KEYFRAME_PASTE_VALUE_OFFSET_CFRA:
const float cfra_y = evaluate_fcurve(fcu, cfra);
offset = cfra_y - aci->bezt[0].vec[1][1];
break;
return offset;
case KEYFRAME_PASTE_VALUE_OFFSET_LEFT_KEY: {
bool replace;
const int fcu_index = BKE_fcurve_bezt_binarysearch_index(
fcu->bezt, cfra, fcu->totvert, &replace);
BezTriple left_key = fcu->bezt[max_ii(fcu_index - 1, 0)];
offset = left_key.vec[1][1] - aci->bezt[0].vec[1][1];
break;
return offset;
}
case KEYFRAME_PASTE_VALUE_OFFSET_RIGHT_KEY: {
bool replace;
const int fcu_index = BKE_fcurve_bezt_binarysearch_index(
fcu->bezt, cfra, fcu->totvert, &replace);
BezTriple right_key = fcu->bezt[min_ii(fcu_index, fcu->totvert - 1)];
offset = right_key.vec[1][1] - aci->bezt[aci->totvert - 1].vec[1][1];
break;
return offset;
}
case KEYFRAME_PASTE_VALUE_OFFSET_NONE:
default:
ChrisLend marked this conversation as resolved
Sybren A. Stüvel commented 2023-02-17 15:13:35 +01:00
Review
Copy Link

You can remove the default:, that way the compiler can complain when a new value was added to the enum, but not handled here.

You can remove the `default:`, that way the compiler can complain when a new value was added to the enum, but not handled here.
offset = 0.0f;
break;
}
return offset;
return 0.0f;
}
eKeyPasteError paste_animedit_keys(bAnimContext *ac,