diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-07-13 18:48:37 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-07-13 18:48:37 +0300 |
| commit | 903b786f69af342c5eda5c58ab25d827369c09cb (patch) | |
| tree | 7f407a929a068c92df1860d0083897b426e04318 /source/blender/editors/space_action/action_data.c | |
| parent | 56ca4fe5bb3c3d8cd92a1c99fc83856aaefdd0c2 (diff) | |
| parent | 2373a2196e21b35998961fff2f53c5fa98036cd8 (diff) | |
Merge branch 'master' into refactor-vertex-group-namesrefactor-vertex-group-names
Diffstat (limited to 'source/blender/editors/space_action/action_data.c')
| -rw-r--r-- | source/blender/editors/space_action/action_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/action_data.c b/source/blender/editors/space_action/action_data.c index 9e69b0a72db..d69c7ab8d48 100644 --- a/source/blender/editors/space_action/action_data.c +++ b/source/blender/editors/space_action/action_data.c @@ -813,7 +813,7 @@ static int action_layer_next_exec(bContext *C, wmOperator *op) NlaTrack *act_track; Scene *scene = CTX_data_scene(C); - float ctime = BKE_scene_frame_get(scene); + float ctime = BKE_scene_ctime_get(scene); /* Get active track */ act_track = BKE_nlatrack_find_tweaked(adt); @@ -925,7 +925,7 @@ static int action_layer_prev_exec(bContext *C, wmOperator *op) NlaTrack *nlt; Scene *scene = CTX_data_scene(C); - float ctime = BKE_scene_frame_get(scene); + float ctime = BKE_scene_ctime_get(scene); /* Sanity Check */ if (adt == NULL) { |