diff options
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_util.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index b82289e007b..cdc44748923 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -874,12 +874,12 @@ void BlenderSession::update_status_progress() scene += ", " + b_rview_name; } else { - BLI_timestr(total_time, time_str, sizeof(time_str)); + BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), total_time); timestatus = "Time:" + string(time_str) + " | "; } if(remaining_time > 0) { - BLI_timestr(remaining_time, time_str, sizeof(time_str)); + BLI_timecode_string_from_time_simple(time_str, sizeof(time_str), remaining_time); timestatus += "Remaining:" + string(time_str) + " | "; } diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h index 78a0adbef00..165242d0dff 100644 --- a/intern/cycles/blender/blender_util.h +++ b/intern/cycles/blender/blender_util.h @@ -28,7 +28,7 @@ * todo: clean this up ... */ extern "C" { -void BLI_timestr(double _time, char *str, size_t maxlen); +size_t BLI_timecode_string_from_time_simple(char *str, size_t maxlen, double time_seconds); void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr); void BKE_image_user_file_path(void *iuser, void *ima, char *path); unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame); |