blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-12 22:10:13 +10:00
parent 03727082e9 973ab436f0
commit 94934199e7
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/mesh_validate.c
View File

@ -1593,8 +1593,15 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool update, const bool select)
MLoop *l_prev = (l + (mp->totloop - 1));
int j;
for (j = 0; j < mp->totloop; j++, l++) {
/* lookup hashed edge index */
med_index = POINTER_AS_INT(BLI_edgehash_lookup(eh, l_prev->v, l->v));
/* Lookup hashed edge index, if it's valid. */
if (l_prev->v != l->v) {
med_index = POINTER_AS_INT(BLI_edgehash_lookup(eh, l_prev->v, l->v));
}
else {
/* This is an invalid edge; normally this does not happen in Blender, but it can be part
* of an imported mesh with invalid geometry. See T76514. */
med_index = 0;
}
l_prev->e = med_index;
l_prev = l;
}

5
source/blender/io/alembic/intern/abc_customdata.h
View File

@ -68,6 +68,8 @@ struct CDStreamConfig {
Alembic::AbcGeom::index_t index;
Alembic::AbcGeom::index_t ceil_index;
const char **modifier_error_message;
CDStreamConfig()
: mloop(NULL),
totloop(0),
@ -80,7 +82,8 @@ struct CDStreamConfig {
weight(0.0f),
time(0.0f),
index(0),
ceil_index(0)
ceil_index(0),
modifier_error_message(NULL)
{
}
};

16
source/blender/io/alembic/intern/abc_reader_mesh.cc
View File

@ -200,6 +200,7 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
unsigned int loop_index = 0;
unsigned int rev_loop_index = 0;
unsigned int uv_index = 0;
bool seen_invalid_geometry = false;
for (int i = 0; i < face_counts->size(); i++) {
const int face_size = (*face_counts)[i];
@ -215,10 +216,18 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
/* NOTE: Alembic data is stored in the reverse order. */
rev_loop_index = loop_index + (face_size - 1);
uint last_vertex_index = 0;
for (int f = 0; f < face_size; f++, loop_index++, rev_loop_index--) {
MLoop &loop = mloops[rev_loop_index];
loop.v = (*face_indices)[loop_index];
if (f > 0 && loop.v == last_vertex_index) {
/* This face is invalid, as it has consecutive loops from the same vertex. This is caused
* by invalid geometry in the Alembic file, such as in T76514. */
seen_invalid_geometry = true;
}
last_vertex_index = loop.v;
if (do_uvs) {
MLoopUV &loopuv = mloopuvs[rev_loop_index];
@ -236,6 +245,12 @@ static void read_mpolys(CDStreamConfig &config, const AbcMeshData &mesh_data)
}
BKE_mesh_calc_edges(config.mesh, false, false);
if (seen_invalid_geometry) {
if (config.modifier_error_message) {
*config.modifier_error_message = "Mesh hash invalid geometry; more details on the console";
}
BKE_mesh_validate(config.mesh, true, true);
}
}
static void process_no_normals(CDStreamConfig &config)
@ -608,6 +623,7 @@ Mesh *AbcMeshReader::read_mesh(Mesh *existing_mesh,
CDStreamConfig config = get_config(new_mesh ? new_mesh : existing_mesh);
config.time = sample_sel.getRequestedTime();
config.modifier_error_message = err_str;
read_mesh_sample(m_iobject.getFullName(), &settings, m_schema, sample_sel, config);