kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for [#26083] Animated Particle Textures have no effect

Browse Source 
* Duplicating particle settings didn't duplicate texture slots.
This commit is contained in:
Janne Karhu 2011-02-15 15:03:49 +00:00
parent 86cf6b4016
commit 78bb53a1bf
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3566,13 +3566,22 @@ ParticleSettings *psys_new_settings(const char *name, Main *main)
ParticleSettings *psys_copy_settings(ParticleSettings *part)
{
ParticleSettings *partn;
int a;
partn= copy_libblock(part);
if(partn->pd) partn->pd= MEM_dupallocN(part->pd);
if(partn->pd2) partn->pd2= MEM_dupallocN(part->pd2);
partn->effector_weights = MEM_dupallocN(part->effector_weights);
partn->boids = boid_copy_settings(part->boids);
for(a=0; a<MAX_MTEX; a++) {
if(part->mtex[a]) {
partn->mtex[a]= MEM_mallocN(sizeof(MTex), "psys_copy_tex");
memcpy(partn->mtex[a], part->mtex[a], sizeof(MTex));
id_us_plus((ID *)partn->mtex[a]->tex);
}
}
return partn;
}