From 1eeae9be15315681483846ae1632a43651c25828 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Thu, 12 Aug 2021 16:58:44 +0200 Subject: [2.93 only] pose slide factor wrong in redo popup Originally this was caused by {rBc71a8e837616}. Above commit wasnt renaming RNA definitions, but not the occurances were RNA values were set. In 3.0, we had improvements to pose-sliding tools (D9054) where this was somewhat ironed out (only partially, see D12187). But since the pose-sliding improvements are not part of 2.93, we have to correct this in 2.93 ONLY. Maniphest Tasks: T89027 Differential Revision: https://developer.blender.org/D12191 --- source/blender/editors/armature/pose_slide.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 93d36abe792..791d3c1ffdb 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -204,7 +204,7 @@ static int pose_slide_init(bContext *C, wmOperator *op, ePoseSlide_Modes mode) pso->mode = mode; /* set range info from property values - these may get overridden for the invoke() */ - pso->percentage = RNA_float_get(op->ptr, "percentage"); + pso->percentage = RNA_float_get(op->ptr, "factor"); pso->prevFrame = RNA_int_get(op->ptr, "prev_frame"); pso->nextFrame = RNA_int_get(op->ptr, "next_frame"); @@ -990,7 +990,7 @@ static void pose_slide_mouse_update_percentage(tPoseSlideOp *pso, const wmEvent *event) { pso->percentage = (event->x - pso->region->winrct.xmin) / ((float)pso->region->winx); - RNA_float_set(op->ptr, "percentage", pso->percentage); + RNA_float_set(op->ptr, "factor", pso->percentage); } /* handle an event to toggle channels mode */ @@ -1116,7 +1116,7 @@ static int pose_slide_modal(bContext *C, wmOperator *op, const wmEvent *event) pso->percentage = value / 100.0f; CLAMP(pso->percentage, 0.0f, 1.0f); - RNA_float_set(op->ptr, "percentage", pso->percentage); + RNA_float_set(op->ptr, "factor", pso->percentage); /* Update pose to reflect the new values (see below) */ do_pose_update = true; -- cgit v1.2.3