Differential D1273 Diff 4147 source/blender/blenkernel/intern/particle_system.c

Changeset View

Standalone View

Show First 20 Lines • Show All 291 Lines • ▼ Show 20 Lines	int psys_get_child_number(Scene scene, ParticleSystem psys)
if (!psys->part->childtype)		if (!psys->part->childtype)
return 0;		return 0;

if (psys->renderdata)		if (psys->renderdata)
nbr= psys->part->ren_child_nbr;		nbr= psys->part->ren_child_nbr;
else		else
nbr= psys->part->child_nbr;		nbr= psys->part->child_nbr;

return get_render_child_particle_number(&scene->r, nbr);		return get_render_child_particle_number(&scene->r, nbr, psys->renderdata != NULL);
}		}

int psys_get_tot_child(Scene scene, ParticleSystem psys)		int psys_get_tot_child(Scene scene, ParticleSystem psys)
{		{
return psys->totpart*psys_get_child_number(scene, psys);		return psys->totpart*psys_get_child_number(scene, psys);
}		}

/************************************************/		/************************************************/
▲ Show 20 Lines • Show All 3,903 Lines • Show Last 20 Lines