Revision: 22401
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22401
Author: genscher
Date: 2009-08-12 14:15:45 +0200 (Wed, 12 Aug 2009)
Log Message:
-----------
Reverting "fix" - didnt fix crash at all.
jahka: please take a look at this, several people in #blendercoders now
reporting crashes on startup.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-08-12 11:12:56 UTC (rev 22400)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-08-12 12:15:45 UTC (rev 22401)
@@ -443,21 +443,18 @@
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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
