[Bf-blender-cvs] [f809ba6] gooseberry_farm: Gooseberry: Fix for flickering grass

Sergey Sharybin noreply at git.blender.org
Wed Jun 10 11:26:02 CEST 2015


Commit: f809ba6a3c39ead82293a5bfc6a45f676e1dabf9
Author: Sergey Sharybin
Date:   Tue Jun 9 18:54:43 2015 +0200
Branches: gooseberry_farm
https://developer.blender.org/rBf809ba6a3c39ead82293a5bfc6a45f676e1dabf9

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 5595d82..32d430d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -372,6 +372,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;
 			}
 		}




More information about the Bf-blender-cvs mailing list