diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-09 15:32:19 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-09 15:33:39 +0400 |
| commit | 0ae8ce3ab1d8295266c8cda60f3446249b4416ab (patch) | |
| tree | 39bfabe586160e69e472a7b6f542a9a893d11a2a | |
| parent | 4bd2609cd0297fcfe5d8f7b47c64f02c4275a4d7 (diff) | |
Fix T40057: invisible hair particles slowing down mesh edits
Skip doing particle update in object_handle_update if object is in
edit mode.
Object will be re-evaluated on exit from edit mode anyway, so it's
_expected_ to be a safe change.
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 745088aced2..a3e8ddccf0b 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2975,7 +2975,7 @@ void BKE_object_handle_update_ex(EvaluationContext *eval_ctx, lamp_drivers_update(scene, ob->data, ctime); /* particles */ - if (ob->particlesystem.first) { + if (ob != scene->obedit && ob->particlesystem.first) { ParticleSystem *tpsys, *psys; DerivedMesh *dm; ob->transflag &= ~OB_DUPLIPARTS; |