[Bf-blender-cvs] [cf043d51c25] blender2.8: Draw manager: Make parent and child particles code to be more equal

[Sergey Sharybin]

Commit: cf043d51c25736d1c64c67413c2e3b467654ede8
Author: Sergey Sharybin
Date:   Tue May 8 13:55:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcf043d51c25736d1c64c67413c2e3b467654ede8

Draw manager: Make parent and child particles code to be more equal

Make parent UVs calculation for simple children to match another block.

===================================================================

M	source/blender/draw/intern/draw_cache_impl_particles.c

===================================================================

diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 351e3bf9e51..7082895e096 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -339,7 +339,7 @@ static void particle_batch_cache_ensure_pos_and_seg(ParticleSystem *psys, Modifi
 			}
 			else if (!parent_uvs[psys->child[i].parent]) {
 				if (psmd != NULL) {
-					parent_uvs[psys->child[i].parent] = MEM_callocN(sizeof(*uv) * num_uv_layers, "Particle UVs");
+					uv = parent_uvs[psys->child[i].parent] = MEM_callocN(sizeof(*uv) * num_uv_layers, "Particle UVs");
 				}
 				if (ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME)) {
 					ParticleData *particle = &psys->particles[psys->child[i].parent];
@@ -352,7 +352,7 @@ static void particle_batch_cache_ensure_pos_and_seg(ParticleSystem *psys, Modifi
 					if (num != DMCACHE_NOTFOUND) {
 						MFace *mface = psmd->dm_final->getTessFaceData(psmd->dm_final, num, CD_MFACE);
 						for (int j = 0; j < num_uv_layers; j++) {
-							psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, parent_uvs[psys->child[i].parent][j]);
+							psys_interpolate_uvs(mtfaces[j] + num, mface->v4, particle->fuv, uv[j]);
 						}
 					}
 				}