bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Sergey Sharybin 2024-07-05 16:55:04 +02:00
commit 1bb12fda96
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/pbvh_bmesh.cc
View File

@ -790,6 +790,9 @@ static bool is_boundary_vert(const BMVert &vertex)
{
BMEdge *edge = vertex.e;
BMEdge *first_edge = edge;
if (first_edge == nullptr) {
return false;
}
do {
if (is_boundary_edge(*edge)) {
return true;

2
source/blender/editors/space_nla/nla_draw.cc
View File

@ -631,7 +631,7 @@ static void nla_draw_strip_text(AnimData *adt,
/* just print the name and the range */
if (strip->flag & NLASTRIP_FLAG_TEMP_META) {
str_len = BLI_snprintf_rlen(str, sizeof(str), DATA_("Temp-Meta"));
str_len = STRNCPY_RLEN(str, DATA_("Temp-Meta"));
}
else {
str_len = STRNCPY_RLEN(str, strip->name);