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:
authorPhilipp Oeser <info@graphics-engineer.com>2021-08-12 17:58:44 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-08-12 18:05:48 +0300
commit1eeae9be15315681483846ae1632a43651c25828 (patch)
treedf14282d61da915acd4b96a418aaa432e2853599
parentee486aa5ce08fb344fba5cdbb25e017854d67bf4 (diff)
[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
-rw-r--r--source/blender/editors/armature/pose_slide.c6
1 files changed, 3 insertions, 3 deletions
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;