griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T62891: particle even distribution is not even.

Browse Source 
CD_ORCO coordinates are stored normalized by convention, this code path did
not store them correctly.
This commit is contained in:
Brecht Van Lommel
2019-03-25 13:55:03 +01:00
parent a6f9e0d644
commit 489c015e70
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/particle_distribute.c
View File

@@ -909,8 +909,12 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti
BKE_mesh_tessface_ensure(mesh);
/* we need orco for consistent distributions */
if (!CustomData_has_layer(&mesh->vdata, CD_ORCO))
CustomData_add_layer(&mesh->vdata, CD_ORCO, CD_ASSIGN, BKE_mesh_orco_verts_get(ob), mesh->totvert);
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);
}
if (from == PART_FROM_VERT) {
MVert *mv = mesh->mvert;
@@ -966,6 +970,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti
MFace *mf = &mesh->mface[i];
if (orcodata) {
/* Transform orcos from normalized 0..1 to object space. */
copy_v3_v3(co1, orcodata[mf->v1]);
copy_v3_v3(co2, orcodata[mf->v2]);
copy_v3_v3(co3, orcodata[mf->v3]);

2
source/blender/makesdna/DNA_customdata_types.h
View File

@@ -108,7 +108,7 @@ typedef enum CustomDataType {
CD_PROP_INT = 11,
CD_PROP_STR = 12,
CD_ORIGSPACE = 13, /* for modifier stack face location mapping */
CD_ORCO = 14,
CD_ORCO = 14, /* undeformed vertex coordinates, normalized to 0..1 range */
/* CD_MTEXPOLY = 15, */ /* deprecated */
CD_MLOOPUV = 16,
CD_MLOOPCOL = 17,