Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +10 -11
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ad3fa09c9 - Show all commits

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

@ -102,17 +102,16 @@ static float view2d_major_step_x__time(const View2D *v2d, const Scene *scene)
for (int step = 1; step < fps; step *= 2) { for (int step = 1; step < fps; step *= 2) {
possible_distances.append(step); possible_distances.append(step);
} }
possible_distances.append(fps);
possible_distances.append(2 * fps); for (int i = 0; i <= 5; i++) {
possible_distances.append(5 * fps); uint fac = pow(60, i);
possible_distances.append(10 * fps); possible_distances.append(fac * fps);
possible_distances.append(30 * fps); possible_distances.append(fac * 2 * fps);
possible_distances.append(60 * fps); possible_distances.append(fac * 5 * fps);
possible_distances.append(2 * 60 * fps); possible_distances.append(fac * 10 * fps);
possible_distances.append(5 * 60 * fps); possible_distances.append(fac * 30 * fps);
possible_distances.append(10 * 60 * fps); possible_distances.append(fac * 60 * fps);
possible_distances.append(30 * 60 * fps); }
possible_distances.append(60 * 60 * fps);
float distance = select_major_distance(possible_distances.data(), float distance = select_major_distance(possible_distances.data(),
possible_distances.size(), possible_distances.size(),