[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22399] branches/blender2.5/blender/source /blender/blenkernel/intern/pointcache.c: Particles: should fix crash on startup

[Daniel Genrich]

Revision: 22399
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22399
Author:   genscher
Date:     2009-08-12 13:12:20 +0200 (Wed, 12 Aug 2009)

Log Message:
-----------
Particles: should fix crash 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 10:38:35 UTC (rev 22398)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c   
2009-08-12 11:12:20 UTC (rev 22399)
@@ -443,18 +443,21 @@
 
        pid->data_types= (1<<BPHYS_DATA_LOCATION) | (1<<BPHYS_DATA_VELOCITY);
 
-       /* TODO for later */
-       //if((psys->part->flag & (PART_UNBORN|PART_DIED))==0)
-       //      pid->data_types|= (1<<BPHYS_DATA_INDEX);
+       if(psys->part)
+       {
+               /* 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
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs