From e73e5c9930bdd10fc343f7c7b34a2265dd4e2658 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 9 Jun 2015 18:54:43 +0200 Subject: Gooseberry: Fix for flickering grass 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. Would need to review if this fix is to go to master/cycles_memory branches but for now it'll be cool to figure out what to do with the farm. --- source/blender/blenkernel/intern/object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index d8f580a3206..f1f683445fe 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -373,6 +373,7 @@ void BKE_object_free_caches(Object *object, bool free_smoke_sim) psmd->dm->needsFree = 1; psmd->dm->release(psmd->dm); psmd->dm = NULL; + psmd->flag |= eParticleSystemFlag_file_loaded; update_flag |= OB_RECALC_DATA; } } -- cgit v1.2.3