Fix T92561: unstable particle distribution with Alembic files
When enabling or disabling a Mesh Sequence Cache modifier of an Object with a hair particle system, the hair would switch positions. This is caused because original coordinates in Blender are expected to be normalized, and toggling the modifier would cause the usage of different orco layers: one that is normalized, and the other which isn't. This bug exposes a few related issues: - if the Alembic file did not have orco data, `MOD_deform_mesh_eval_get`, used by the particle system modifier, would add an orco layer without normalization - `MOD_deform_mesh_eval_get` would also ignore the presence of an orco layer (e.g. one that could have been read from Alembic) - if the Alembic file did have orco data, the data would be read unnormalized To fix those various issues, original coordinates are normalized when read from Alembic and unnormalized when written to Alembic; and a new utility function `BKE_mesh_orco_ensure` is added to add a normalized orco layer if none exists on the mesh already, this function derives from the code used in the particle system. Reviewed By: brecht Maniphest Tasks: T92561 Differential Revision: https://developer.blender.org/D13306
This commit is contained in:
parent
8b44b756d8
commit
77694b571f
Notes:
blender-bot
2023-02-14 06:17:14 +01:00
Referenced by issue #98030, mirror error in particle system Hair Referenced by issue #95889, Alembic crashes on Linux Referenced by issue #93479, 3.0 Potential candidates for corrective releases Referenced by issue #92561, Mesh Sequence Cache (ABC) an hair interpolated children distribution issue (triangulate modifier seem to fix it)
|
@ -136,6 +136,10 @@ bool BKE_mesh_clear_facemap_customdata(struct Mesh *me);
|
|||
|
||||
float (*BKE_mesh_orco_verts_get(struct Object *ob))[3];
|
||||
void BKE_mesh_orco_verts_transform(struct Mesh *me, float (*orco)[3], int totvert, int invert);
|
||||
|
||||
/* Add a CD_ORCO layer to the Mesh if there is none already. */
|
||||
void BKE_mesh_orco_ensure(struct Object *ob, struct Mesh *mesh);
|
||||
|
||||
int BKE_mesh_mface_index_validate(struct MFace *mface,
|
||||
struct CustomData *mfdata,
|
||||
int mfindex,
|
||||
|
|
|
@ -1319,6 +1319,18 @@ void BKE_mesh_orco_verts_transform(Mesh *me, float (*orco)[3], int totvert, int
|
|||
}
|
||||
}
|
||||
|
||||
void BKE_mesh_orco_ensure(Object *ob, Mesh *mesh)
|
||||
{
|
||||
if (CustomData_has_layer(&mesh->vdata, CD_ORCO)) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Orcos are stored in normalized 0..1 range by convention. */
|
||||
float(*orcodata)[3] = BKE_mesh_orco_verts_get(ob);
|
||||
BKE_mesh_orco_verts_transform(mesh, orcodata, mesh->totvert, false);
|
||||
CustomData_add_layer(&mesh->vdata, CD_ORCO, CD_ASSIGN, orcodata, mesh->totvert);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rotates the vertices of a face in case v[2] or v[3] (vertex index) is = 0.
|
||||
* this is necessary to make the if #MFace.v4 check for quads work.
|
||||
|
|
|
@ -997,12 +997,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx,
|
|||
BKE_mesh_tessface_ensure(mesh);
|
||||
|
||||
/* we need orco for consistent distributions */
|
||||
if (!CustomData_has_layer(&mesh->vdata, CD_ORCO)) {
|
||||
/* Orcos are stored in normalized 0..1 range by convention. */
|
||||
float(*orcodata)[3] = BKE_mesh_orco_verts_get(ob);
|
||||
BKE_mesh_orco_verts_transform(mesh, orcodata, mesh->totvert, false);
|
||||
CustomData_add_layer(&mesh->vdata, CD_ORCO, CD_ASSIGN, orcodata, mesh->totvert);
|
||||
}
|
||||
BKE_mesh_orco_ensure(ob, mesh);
|
||||
|
||||
if (from == PART_FROM_VERT) {
|
||||
MVert *mv = mesh->mvert;
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "BLI_utildefines.h"
|
||||
|
||||
#include "BKE_customdata.h"
|
||||
#include "BKE_mesh.h"
|
||||
|
||||
/* NOTE: for now only UVs and Vertex Colors are supported for streaming.
|
||||
* Although Alembic only allows for a single UV layer per {I|O}Schema, and does
|
||||
|
@ -232,7 +233,8 @@ static void write_mcol(const OCompoundProperty &prop,
|
|||
|
||||
void write_generated_coordinates(const OCompoundProperty &prop, CDStreamConfig &config)
|
||||
{
|
||||
const void *customdata = CustomData_get_layer(&config.mesh->vdata, CD_ORCO);
|
||||
Mesh *mesh = config.mesh;
|
||||
const void *customdata = CustomData_get_layer(&mesh->vdata, CD_ORCO);
|
||||
if (customdata == nullptr) {
|
||||
/* Data not available, so don't even bother creating an Alembic property for it. */
|
||||
return;
|
||||
|
@ -247,6 +249,11 @@ void write_generated_coordinates(const OCompoundProperty &prop, CDStreamConfig &
|
|||
coords[vertex_idx].setValue(orco_yup[0], orco_yup[1], orco_yup[2]);
|
||||
}
|
||||
|
||||
/* ORCOs are always stored in the normalized 0..1 range in Blender, but Alembic stores them
|
||||
* unnormalized, so we need to unnormalize (invert transform) them. */
|
||||
BKE_mesh_orco_verts_transform(
|
||||
mesh, reinterpret_cast<float(*)[3]>(&coords[0]), mesh->totvert, true);
|
||||
|
||||
if (!config.abc_orco.valid()) {
|
||||
/* Create the Alembic property and keep a reference so future frames can reuse it. */
|
||||
config.abc_orco = OV3fGeomParam(prop, propNameOriginalCoordinates, false, kVertexScope, 1);
|
||||
|
@ -515,13 +522,14 @@ void read_generated_coordinates(const ICompoundProperty &prop,
|
|||
IV3fGeomParam::Sample sample = param.getExpandedValue(iss);
|
||||
Alembic::AbcGeom::V3fArraySamplePtr abc_ocro = sample.getVals();
|
||||
const size_t totvert = abc_ocro.get()->size();
|
||||
Mesh *mesh = config.mesh;
|
||||
|
||||
void *cd_data;
|
||||
if (CustomData_has_layer(&config.mesh->vdata, CD_ORCO)) {
|
||||
cd_data = CustomData_get_layer(&config.mesh->vdata, CD_ORCO);
|
||||
if (CustomData_has_layer(&mesh->vdata, CD_ORCO)) {
|
||||
cd_data = CustomData_get_layer(&mesh->vdata, CD_ORCO);
|
||||
}
|
||||
else {
|
||||
cd_data = CustomData_add_layer(&config.mesh->vdata, CD_ORCO, CD_CALLOC, nullptr, totvert);
|
||||
cd_data = CustomData_add_layer(&mesh->vdata, CD_ORCO, CD_CALLOC, nullptr, totvert);
|
||||
}
|
||||
|
||||
float(*orcodata)[3] = static_cast<float(*)[3]>(cd_data);
|
||||
|
@ -529,6 +537,10 @@ void read_generated_coordinates(const ICompoundProperty &prop,
|
|||
const Imath::V3f &abc_coords = (*abc_ocro)[vertex_idx];
|
||||
copy_zup_from_yup(orcodata[vertex_idx], abc_coords.getValue());
|
||||
}
|
||||
|
||||
/* ORCOs are always stored in the normalized 0..1 range in Blender, but Alembic stores them
|
||||
* unnormalized, so we need to normalize them. */
|
||||
BKE_mesh_orco_verts_transform(mesh, orcodata, mesh->totvert, false);
|
||||
}
|
||||
|
||||
void read_custom_data(const std::string &iobject_full_name,
|
||||
|
|
|
@ -219,8 +219,7 @@ Mesh *MOD_deform_mesh_eval_get(Object *ob,
|
|||
}
|
||||
|
||||
if (use_orco) {
|
||||
CustomData_add_layer(
|
||||
&mesh->vdata, CD_ORCO, CD_ASSIGN, BKE_mesh_orco_verts_get(ob), mesh->totvert);
|
||||
BKE_mesh_orco_ensure(ob, mesh);
|
||||
}
|
||||
}
|
||||
else if (ELEM(ob->type, OB_FONT, OB_CURVE, OB_SURF)) {
|
||||
|
|
Loading…
Reference in New Issue