[Bf-blender-cvs] [e73e5c9] gooseberry: Gooseberry: Fix for flickering grass

Sergey Sharybin noreply at git.blender.org
Tue Jun 9 18:56:52 CEST 2015


Commit: e73e5c9930bdd10fc343f7c7b34a2265dd4e2658
Author: Sergey Sharybin
Date:   Tue Jun 9 18:54:43 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBe73e5c9930bdd10fc343f7c7b34a2265dd4e2658

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.

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

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

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

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




More information about the Bf-blender-cvs mailing list