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

Fix (unreported) assert in texture code when loading some old 2.74 blend file. 

Trying to open the 2.74 Fishy Cat file would generate endless asserts in
customdata code. This commit refactors and cleans up the code of
`psys_get_dupli_texture` to avoid useless calls and data access, and
validate data before trying to further access it.

No behavioral changes expected here (besides getting rid of the assert).
This commit is contained in:
Bastien Montagne 2020-10-02 11:42:36 +02:00
parent 062dfab159
commit 2b90dd1ac5
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/blenkernel/intern/particle.c
View File

@ -4804,7 +4804,6 @@ void psys_get_dupli_texture(ParticleSystem *psys,
float orco[3])
{
MFace *mface;
MTFace *mtface;
float loc[3];
int num;
@ -4816,21 +4815,25 @@ void psys_get_dupli_texture(ParticleSystem *psys,
* For now just include this workaround as an alternative to crashing,
* but longer term meta-balls should behave in a more manageable way, see: T46622. */
uv[0] = uv[1] = 0.f;
uv[0] = uv[1] = 0.0f;
/* Grid distribution doesn't support UV or emit from vertex mode */
bool is_grid = (part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT);
if (cpa) {
if ((part->childtype == PART_CHILD_FACES) && (psmd->mesh_final != NULL)) {
CustomData *mtf_data = &psmd->mesh_final->fdata;
const int uv_idx = CustomData_get_render_layer(mtf_data, CD_MTFACE);
mtface = CustomData_get_layer_n(mtf_data, CD_MTFACE, uv_idx);
if (!is_grid) {
CustomData *mtf_data = &psmd->mesh_final->fdata;
const int uv_idx = CustomData_get_render_layer(mtf_data, CD_MTFACE);
if (mtface && !is_grid) {
mface = CustomData_get(&psmd->mesh_final->fdata, cpa->num, CD_MFACE);
mtface += cpa->num;
psys_interpolate_uvs(mtface, mface->v4, cpa->fuv, uv);
if (uv_idx >= 0) {
MTFace *mtface = CustomData_get_layer_n(mtf_data, CD_MTFACE, uv_idx);
if (mtface != NULL) {
mface = CustomData_get(&psmd->mesh_final->fdata, cpa->num, CD_MFACE);
mtface += cpa->num;
psys_interpolate_uvs(mtface, mface->v4, cpa->fuv, uv);
}
}
}
psys_particle_on_emitter(psmd,
@ -4851,10 +4854,6 @@ void psys_get_dupli_texture(ParticleSystem *psys,
}
if ((part->from == PART_FROM_FACE) && (psmd->mesh_final != NULL) && !is_grid) {
CustomData *mtf_data = &psmd->mesh_final->fdata;
const int uv_idx = CustomData_get_render_layer(mtf_data, CD_MTFACE);
mtface = CustomData_get_layer_n(mtf_data, CD_MTFACE, uv_idx);
num = pa->num_dmcache;
if (num == DMCACHE_NOTFOUND) {
@ -4867,10 +4866,16 @@ void psys_get_dupli_texture(ParticleSystem *psys,
num = DMCACHE_NOTFOUND;
}
if (mtface && !ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
mface = CustomData_get(&psmd->mesh_final->fdata, num, CD_MFACE);
mtface += num;
psys_interpolate_uvs(mtface, mface->v4, pa->fuv, uv);
if (!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
CustomData *mtf_data = &psmd->mesh_final->fdata;
const int uv_idx = CustomData_get_render_layer(mtf_data, CD_MTFACE);
if (uv_idx >= 0) {
MTFace *mtface = CustomData_get_layer_n(mtf_data, CD_MTFACE, uv_idx);
mface = CustomData_get(&psmd->mesh_final->fdata, num, CD_MFACE);
mtface += num;
psys_interpolate_uvs(mtface, mface->v4, pa->fuv, uv);
}
}
}