diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2012-03-20 16:59:45 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2012-03-20 16:59:45 +0400 |
| commit | ad1a181316ae4002d5d77fd2fa298c92b6f0c2b5 (patch) | |
| tree | 24a680309985b10cf11fef015313cb44f9de7322 /source/blender/editors/space_view3d | |
| parent | 12be17bfa4c1e9f40dd5f723ca78c6ca9331c668 (diff) | |
Fix for [#30445] Particle simulation, rekey crashes blender
- Entering particle mode crashed due to missing checks if a particle didn't have any baked keys.
- The rekey functionality is only supported for hair, so replaced the operator poll function with the correct one.
- Also replaced a couple of other "only hair" operator poll functions to the correct ones.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index a8f5aff2e1c..f470accae82 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4911,7 +4911,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit) cd=cdata; pd=pdata; for (i=0, point=edit->points; i<totpoint; i++, point++) { - if (point->flag & PEP_HIDE) + if (point->flag & PEP_HIDE || point->totkey == 0) continue; if (point->keys->flag & PEK_USE_WCO) @@ -4931,7 +4931,7 @@ static void draw_ptcache_edit(Scene *scene, View3D *v3d, PTCacheEdit *edit) } else if (pset->selectmode == SCE_SELECT_END) { for (i=0, point=edit->points; i<totpoint; i++, point++) { - if ((point->flag & PEP_HIDE)==0) { + if ((point->flag & PEP_HIDE)==0 && point->totkey) { key = point->keys + point->totkey - 1; if (key->flag & PEK_SELECT) glColor3fv(sel_col); |