[Bf-blender-cvs] [3ddea1f] blender-v2.75-release: Fix for unwanted particle re-distribution happening due to memory optimization

Sergey Sharybin noreply at git.blender.org
Thu Jun 18 17:36:36 CEST 2015


Commit: 3ddea1fa462dc40bc0c6fe3f53a61324799121c0
Author: Sergey Sharybin
Date:   Tue Jun 9 18:54:43 2015 +0200
Branches: blender-v2.75-release
https://developer.blender.org/rB3ddea1fa462dc40bc0c6fe3f53a61324799121c0

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.

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

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

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

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




More information about the Bf-blender-cvs mailing list