[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26200] trunk/blender/source/blender: bugfix [#20767] Particle edit mode crashes

[Campbell Barton]

Revision: 26200
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26200
Author:   campbellbarton
Date:     2010-01-22 22:40:31 +0100 (Fri, 22 Jan 2010)

Log Message:
-----------
bugfix [#20767] Particle edit mode crashes
& missing include added

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/threads.c
    trunk/blender/source/blender/editors/physics/particle_edit.c

Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c	2010-01-22 18:59:13 UTC (rev 26199)
+++ trunk/blender/source/blender/blenlib/intern/threads.c	2010-01-22 21:40:31 UTC (rev 26200)
@@ -52,6 +52,7 @@
 #include <sys/sysctl.h>
 #else
 #include <unistd.h> 
+#include <sys/time.h>
 #endif
 
 /* ********** basic thread control API ************ 

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2010-01-22 18:59:13 UTC (rev 26199)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2010-01-22 21:40:31 UTC (rev 26200)
@@ -4065,7 +4065,7 @@
 	
 		/* mesh may have changed since last entering editmode.
 		 * note, this may have run before if the edit data was just created, so could avoid this and speed up a little */
-		if(edit)
+		if(edit && edit->psys)
 			recalc_emitter_field(ob, edit->psys);
 		
 		toggle_particle_cursor(C, 1);