Revision: 15034
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15034
Author: jhk
Date: 2008-05-29 01:38:40 +0200 (Thu, 29 May 2008)
Log Message:
-----------
Bug fix: [#13268] Crash when creating a new particle system
-Ugh.. sorry about that.. damn default cube with it's default material!
Modified Paths:
--------------
trunk/blender/source/blender/src/drawobject.c
Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c 2008-05-28 21:19:56 UTC
(rev 15033)
+++ trunk/blender/source/blender/src/drawobject.c 2008-05-28 23:38:40 UTC
(rev 15034)
@@ -3111,7 +3111,7 @@
pa_time=(cfra-pa->time)/pa->lifetime;
if((part->flag&PART_ABS_TIME)==0){
- if(ma->ipo){
+ if(ma && ma->ipo){
/* correction for lifetime */
calc_ipo(ma->ipo,
100.0f*pa_time);
execute_ipo((ID *)ma, ma->ipo);
@@ -3138,7 +3138,7 @@
pa_time=psys_get_child_time(psys,cpa,cfra);
if((part->flag&PART_ABS_TIME)==0) {
- if(ma->ipo){
+ if(ma && ma->ipo){
/* correction for lifetime */
calc_ipo(ma->ipo,
100.0f*pa_time);
execute_ipo((ID *)ma, ma->ipo);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
