blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Sculpt: Fix #107123: New normals impl. for PBVH_FACES #107456

Closed
Joseph Eagar wants to merge 5 commits from temp-pbvh-normals into main
pull from: temp-pbvh-normals
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 5 Files Changed 3 +11 -6
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9507494675 - Show all commits

13
source/blender/blenkernel/intern/movieclip.c
View File

@ -474,7 +474,9 @@ static int get_timecode(MovieClip *clip, int flag)
return clip->proxy.tc;
}
static void get_sequence_filepath(const MovieClip *clip, const int framenr, char *filepath)
static void get_sequence_filepath(const MovieClip *clip,
const int framenr,
char filepath[FILE_MAX])
{
ushort numlen;
char head[FILE_MAX], tail[FILE_MAX];
@ -489,7 +491,7 @@ static void get_sequence_filepath(const MovieClip *clip, const int framenr, char
if (numlen) {
BLI_path_sequence_encode(filepath,
sizeof(filepath),
FILE_MAX,
head,
tail,
numlen,
@ -503,8 +505,11 @@ static void get_sequence_filepath(const MovieClip *clip, const int framenr, char
}
/* supposed to work with sequences only */
static void get_proxy_filepath(
const MovieClip *clip, int proxy_render_size, bool undistorted, int framenr, char *filepath)
static void get_proxy_filepath(const MovieClip *clip,
int proxy_render_size,
bool undistorted,
int framenr,
char filepath[FILE_MAX])
{
int size = rendersize_to_number(proxy_render_size);
char dir[FILE_MAX], clipdir[FILE_MAX], clipfile[FILE_MAX];

2
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@ -615,7 +615,7 @@ struct StrokeCache {
float symm_rot_mat_inv[4][4];
/* Accumulate mode. Note: inverted for SCULPT_TOOL_DRAW_SHARP. */
bool accum;
bool accum;
float anchored_location[3];

2
source/blender/geometry/intern/uv_pack.cc
View File

@ -884,7 +884,7 @@ static void pack_island_xatlas(const Span<UVAABBIsland *> island_indices,
float max_u = 0.0f;
float max_v = 0.0f;
int scan_line = 0; /* Current "scan_line" of occupancy bitmap. */
int scan_line = 0; /* Current "scan_line" of occupancy bitmap. */
int traced_islands = 0; /* Which islands are currently traced in `occupancy`. */
int i = 0;