smoke_particle-children.patch
Public
Actions

Authored By

	Kai Kostack (kaikostack)
	Nov 13 2013, 4:02 PM

Size

1 KB

Subscribers

None

smoke_particle-children.patch
View Options

	Index: source/blender/blenkernel/intern/smoke.c
	===================================================================
	--- source/blender/blenkernel/intern/smoke.c (revision 43745)
	+++ source/blender/blenkernel/intern/smoke.c (working copy)
	@@ -1008,6 +1008,7 @@
	{
	ParticleSimulationData sim;
	ParticleSystem *psys = sfs->psys;
	+ int totpart=psys->totpart, totchild;
	int p = 0;
	float *density = smoke_get_density(sds->fluid);
	float *bigdensity = smoke_turbulence_get_density(sds->wt);
	@@ -1043,7 +1044,12 @@
	}

	// mostly copied from particle code
	- for(p=0; p<psys->totpart; p++)
	+ if(psys->part->type==PART_HAIR && !psys->childcache)
	+ totchild=0;
	+ else
	+ totchild=psys->totchild*psys->part->disp/100;
	+
	+ for(p=0; p<totpart+totchild; p++)
	{
	int cell[3];
	size_t i = 0;
	@@ -1051,8 +1057,11 @@
	int badcell = 0;
	ParticleKey state;

	- if(psys->particles[p].flag & (PARS_NO_DISP\|PARS_UNEXIST))
	+ if(p<totpart)
	+ {
	+ if(psys->particles[p].flag & (PARS_NO_DISP\|PARS_UNEXIST))
	continue;
	+ }

	state.time = smd->time;