blender/blender
141
451
Fork 651
Code Issues 6.5k Pull Requests 824 Projects 18 Wiki Activity

Animation: blend offset slider #106518

Closed
AresDeveaux wants to merge 12 commits from AresDeveaux/blender:blend_offset_slider into main
pull from: AresDeveaux/blender:blend_offset_slider
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 12 Files Changed 6 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c93d1f2cf - Show all commits

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

@ -497,7 +497,7 @@ void blend_offset_fcurve_segment(FCurve *fcu, FCurveSegment *segment, const floa
for (int i = segment->start_index; i < segment->start_index + segment->length; i++) {
const float key_y_value = fcu->bezt[i].vec[1][1] + y_delta * fabs(factor);
Christoph Lendenfeld commented 2023-04-13 12:25:25 +02:00
Outdated
Review
Copy Link

this can be simplified to fcu->bezt[segment->start_index]
same for getting the segment end

this can be simplified to `fcu->bezt[segment->start_index]` same for getting the segment end
Sybren A. Stüvel commented 2023-05-09 16:40:42 +02:00
Review
Copy Link

Since ``y_delta * fabs(factor)` doesnt' change over the course of this loop, take it out of the loop:

const float weighted_delta = y_delta * fabs(factor);
Since ``y_delta * fabs(factor)` doesnt' change over the course of this loop, take it out of the loop: ```c const float weighted_delta = y_delta * fabs(factor); ```
move_key(&fcu->bezt[i], key_y_value);
BKE_fcurve_keyframe_move_value_with_handles(&fcu->bezt[i], key_y_value);
}
}

2
source/blender/editors/space_graph/graph_slider_ops.c
View File

@ -1041,7 +1041,7 @@ static int blend_offset_invoke(bContext *C, wmOperator *op, const wmEvent *event
gso->modal_update = blend_offset_modal_update;
gso->factor_prop = RNA_struct_find_property(op->ptr, "factor");
blend_offset_draw_status_header(C, gso);
ED_slider_is_bidirectional_set(gso->slider, true);
ED_slider_factor_bounds_set(gso->slider, -1, 1);
ED_slider_factor_set(gso->slider, 0.0f);
return invoke_result;