blender
/
blender
135
403
Fork 585
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

UI: improve "Compact with Milliseconds" timecode style #119768

Open
Damien Picard wants to merge 2 commits from pioverfour/blender:dp_compact_timecode_format into main
pull from: pioverfour/blender:dp_compact_timecode_format
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 2 Files Changed 3 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/animation/time_scrub_ui.cc
View File

@ -65,7 +65,7 @@ static void get_current_time_str(
const Scene *scene, bool display_seconds, int frame, char *r_str, uint str_maxncpy)
{
if (display_seconds) {
BLI_timecode_string_from_time(r_str, str_maxncpy, 0, FRA2TIME(frame), FPS, U.timecode_style);
BLI_timecode_string_from_time(r_str, str_maxncpy, -1, FRA2TIME(frame), FPS, U.timecode_style);
}
else {
BLI_snprintf(r_str, str_maxncpy, "%d", frame);

2
source/blender/editors/interface/view2d_draw.cc
View File

@ -416,7 +416,7 @@ static void view_to_string__time(
{
const Scene *scene = (const Scene *)user_data;
int brevity_level = 0;
int brevity_level = -1;
if (U.timecode_style == USER_TIMECODE_MINIMAL && v2d_step >= FPS) {
brevity_level = 1;
}

6
source/blender/makesrna/intern/rna_userdef.cc
View File

@ -4775,9 +4775,9 @@ static void rna_def_userdef_view(BlenderRNA *brna)
{USER_TIMECODE_MILLISECONDS,
"MILLISECONDS",
0,
"Compact with Milliseconds",
"Similar to SMPTE (Compact), except that instead of frames, "
"milliseconds are shown instead"},
"Compact with Decimals",
"Similar to SMPTE (Compact), except that the decimal part of the second is shown instead "
"of frames"},
{USER_TIMECODE_SECONDS_ONLY,
"SECONDS_ONLY",
0,