Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-06-09 19:54:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-06-09 19:56:43 +0300
commite73e5c9930bdd10fc343f7c7b34a2265dd4e2658 (patch)
tree020e4a185acefd5965ded1ece2ba58089b191372
parent313c958f438c103a45f62679069e069788d992d3 (diff)
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.
-rw-r--r--source/blender/blenkernel/intern/object.c1
1 files changed, 1 insertions, 0 deletions
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;
}
}