diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-09 19:54:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-18 18:24:13 +0300 |
| commit | 3ddea1fa462dc40bc0c6fe3f53a61324799121c0 (patch) | |
| tree | 041a589f1f31011a60cea24c1db13da461870ff6 | |
| parent | 45fd68bc98e0146c01dd075ebc15502c02033153 (diff) | |
Fix for unwanted particle re-distribution happening due to memory optimization
The issue was caused by memory optimization marking particle system to recalc,
and because of the way how particle flags works it was possible that it'll
cause particle's re-distribution. Now this memory optimization will act the
same as loading the file.
This commit appears to be safe according to our render farm and is safe to
be included into final release.
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f8fe53063bc..d51ffa4cf60 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -363,6 +363,7 @@ void BKE_object_free_caches(Object *object) psmd->dm->needsFree = 1; psmd->dm->release(psmd->dm); psmd->dm = NULL; + psmd->flag |= eParticleSystemFlag_file_loaded; update_flag |= OB_RECALC_DATA; } } |