[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34330] trunk/blender/source/blender/ blenkernel/intern/particle.c: Fix for [#25637] curveguide forcefield(Kink: Braid) + particlesystem cause crash by Null Pointer in some cases

[Janne Karhu]

Revision: 34330
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34330
Author:   jhk
Date:     2011-01-15 12:00:15 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
Fix for [#25637] curveguide forcefield(Kink: Braid) + particlesystem cause crash by Null Pointer in some cases
* Missing null pointer check.

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-01-15 10:45:31 UTC (rev 34329)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2011-01-15 12:00:15 UTC (rev 34330)
@@ -1962,8 +1962,10 @@
 		float vec_one[3], radius, state_co[3];
 		float inp_y, inp_z, length;
 
-		mul_qt_v3(par_rot, y_vec);
-		mul_qt_v3(par_rot, z_vec);
+		if(par_rot) {
+			mul_qt_v3(par_rot, y_vec);
+			mul_qt_v3(par_rot, z_vec);
+		}
 		
 		mul_v3_fl(par_vec, -1.f);
 		radius= normalize_v3_v3(vec_one, par_vec);