[Bf-blender-cvs] [0ae8ce3] master: Fix T40057: invisible hair particles slowing down mesh edits

[Sergey Sharybin]

Commit: 0ae8ce3ab1d8295266c8cda60f3446249b4416ab
Author: Sergey Sharybin
Date:   Mon Jun 9 17:32:19 2014 +0600
https://developer.blender.org/rB0ae8ce3ab1d8295266c8cda60f3446249b4416ab

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.

===================================================================

M	source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 745088a..a3e8ddc 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;