diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 11:43:37 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-31 11:43:37 +0300 |
commit | 27496cc46bbfd76e98ad3b1ccb8fea534763ffb5 (patch) | |
tree | b45298a219f17737f6c59d4cc7657e3ff6df7d02 /source | |
parent | fe6e751e695dbb32e4dc7ed20726ee3d266d0c7e (diff) | |
parent | 36389444b03ec149fb9c013b744b9d5126f85ae2 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/object/object_shapekey.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 5e66dc00fd2..30fb2896670 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -378,8 +378,10 @@ static int shape_key_retime_exec(bContext *C, wmOperator *UNUSED(op)) if (!key || !kb) return OPERATOR_CANCELLED; - for (kb = key->block.first; kb; kb = kb->next) - kb->pos = (cfra += 0.1f); + for (kb = key->block.first; kb; kb = kb->next) { + kb->pos = cfra; + cfra += 0.1f; + } DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); |