[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35572] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#26516] Blender crashes for Particle Physics Path Editing.

[Janne Karhu]

Revision: 35572
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35572
Author:   jhk
Date:     2011-03-16 13:03:05 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
Fix for [#26516] Blender crashes for Particle Physics Path Editing.
* Silly own mistake from some previous code cleanup.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2011-03-16 12:52:30 UTC (rev 35571)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2011-03-16 13:03:05 UTC (rev 35572)
@@ -1211,7 +1211,7 @@
 	PTCacheEditPoint *point = pind->epoint;
 	ParticleKey keys[4];
 	int point_vel = (point && point->keys->vel);
-	float real_t, dfra, keytime, invdt;
+	float real_t, dfra, keytime, invdt = 1.f;
 
 	/* billboards wont fill in all of these, so start cleared */
 	memset(keys, 0, sizeof(keys));
@@ -1350,10 +1350,10 @@
 
 	dfra = keys[2].time - keys[1].time;
 	keytime = (real_t - keys[1].time) / dfra;
-	invdt = dfra * 0.04f * psys->part->timetweak;
 
 	/* convert velocity to timestep size */
 	if(pind->keyed || pind->cache || point_vel){
+		invdt = dfra * 0.04f * (psys ? psys->part->timetweak : 1.f);
 		mul_v3_fl(keys[1].vel, invdt);
 		mul_v3_fl(keys[2].vel, invdt);
 		interp_qt_qtqt(result->rot,keys[1].rot,keys[2].rot,keytime);