[Bf-blender-cvs] [25a223c3bdd] blender2.8: Draw: Use more proper particles index lookup

Sergey Sharybin noreply at git.blender.org
Mon Jun 25 18:22:43 CEST 2018


Commit: 25a223c3bdddc4ced2558afcbc81f379ec3beff9
Author: Sergey Sharybin
Date:   Mon Jun 25 18:22:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB25a223c3bdddc4ced2558afcbc81f379ec3beff9

Draw: Use more proper particles index lookup

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

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 d1e05b525ef..28693b47c89 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -289,12 +289,12 @@ static void particle_calculate_parent_uvs(
 	}
 	ParticleData *particle = &psys->particles[parent_index];
 	int num = particle->num_dmcache;
-	if (num == DMCACHE_NOTFOUND) {
+	if (num == DMCACHE_NOTFOUND || num == DMCACHE_ISCHILD) {
 		if (particle->num < psmd->mesh_final->totface) {
 			num = particle->num;
 		}
 	}
-	if (num != DMCACHE_NOTFOUND) {
+	if (num != DMCACHE_NOTFOUND && num != DMCACHE_ISCHILD) {
 		MFace *mface = &psmd->mesh_final->mface[num];
 		for (int j = 0; j < num_uv_layers; j++) {
 			psys_interpolate_uvs(
@@ -323,12 +323,12 @@ static void particle_calculate_parent_mcol(
 	}
 	ParticleData *particle = &psys->particles[parent_index];
 	int num = particle->num_dmcache;
-	if (num == DMCACHE_NOTFOUND) {
+	if (num == DMCACHE_NOTFOUND || num == DMCACHE_ISCHILD) {
 		if (particle->num < psmd->mesh_final->totface) {
 			num = particle->num;
 		}
 	}
-	if (num != DMCACHE_NOTFOUND) {
+	if (num != DMCACHE_NOTFOUND && num != DMCACHE_ISCHILD) {
 		MFace *mface = &psmd->mesh_final->mface[num];
 		for (int j = 0; j < num_uv_layers; j++) {
 			psys_interpolate_mcol(



More information about the Bf-blender-cvs mailing list