diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-23 00:40:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-23 00:40:31 +0300 |
| commit | 5badcca867cb0a68a7e600ed350dfe49813f9729 (patch) | |
| tree | 95bcf8f0e2e0067a251aaef3a5bedec25842daaa /source/blender | |
| parent | 8038171919134f87d54b2c4327662c3e12e5d77b (diff) | |
bugfix [#20767] Particle edit mode crashes
& missing include added
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index e5d0385b6e3..9df746276bd 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -52,6 +52,7 @@ #include <sys/sysctl.h> #else #include <unistd.h> +#include <sys/time.h> #endif /* ********** basic thread control API ************ diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index eb03d3954d2..44e4f938e61 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4065,7 +4065,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op) /* 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); |