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

Reverting "fix" - didnt fix crash at all.

Browse Source 
jahka: please take a look at this, several people in #blendercoders now reporting crashes on startup.
This commit is contained in:
Daniel Genrich 2009-08-12 12:15:45 +00:00
parent 64dba1596d
commit 3a1da2219d
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenkernel/intern/pointcache.c
View File

@ -443,21 +443,18 @@ void BKE_ptcache_id_from_particles(PTCacheID *pid, Object *ob, ParticleSystem *p
pid->data_types= (1<<BPHYS_DATA_LOCATION) | (1<<BPHYS_DATA_VELOCITY);
if(psys->part)
{
/* TODO for later */
//if((psys->part->flag & (PART_UNBORN|PART_DIED))==0)
// pid->data_types|= (1<<BPHYS_DATA_INDEX);
/* TODO for later */
//if((psys->part->flag & (PART_UNBORN|PART_DIED))==0)
// pid->data_types|= (1<<BPHYS_DATA_INDEX);
if(psys->part->phystype == PART_PHYS_BOIDS)
pid->data_types|= (1<<BPHYS_DATA_AVELOCITY) | (1<<BPHYS_DATA_ROTATION) | (1<<BPHYS_DATA_BOIDS);
if(psys->part->phystype == PART_PHYS_BOIDS)
pid->data_types|= (1<<BPHYS_DATA_AVELOCITY) | (1<<BPHYS_DATA_ROTATION) | (1<<BPHYS_DATA_BOIDS);
if(psys->part->rotmode || psys->part->avemode)
pid->data_types|= (1<<BPHYS_DATA_AVELOCITY) | (1<<BPHYS_DATA_ROTATION);
if(psys->part->rotmode || psys->part->avemode)
pid->data_types|= (1<<BPHYS_DATA_AVELOCITY) | (1<<BPHYS_DATA_ROTATION);
if(psys->part->flag & PART_ROT_DYN)
pid->data_types|= (1<<BPHYS_DATA_ROTATION);
}
if(psys->part->flag & PART_ROT_DYN)
pid->data_types|= (1<<BPHYS_DATA_ROTATION);
pid->info_types= (1<<BPHYS_DATA_TIMES);
}