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>2014-03-18 16:54:41 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-03-19 09:02:29 +0400
commit19e627cab34a04a3d01b2e3a868b7bf91d56e8f9 (patch)
tree2b01e4e108bebcf0954bb58fe734a65bc514e279 /source/blender/blenkernel/intern/object.c
parent2525f9c5f31e90bcb8f2e8c84558a2bc35e3207c (diff)
Backport revisions for the final 2.70 releasev2.70
e6a359a, 9437927, a205700, d908c90, a6e3471, deef641, 4080673, 0141265, 0c6e744, f959e3d, ade6646, caf5d90, 5febb09, d08e6ab, 22873ea, 3d031d1, c450ea2, 60cab47, ed26edb, df25dbf, f127f49.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 43dbc34f3d3..0970af46a6b 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -331,6 +331,10 @@ void BKE_object_free_derived_caches(Object *ob)
free_path(ob->curve_cache->path);
ob->curve_cache->path = NULL;
}
+
+ /* Signal for viewport to run DAG workarounds. */
+ MEM_freeN(ob->curve_cache);
+ ob->curve_cache = NULL;
}
}
@@ -1282,6 +1286,7 @@ static ParticleSystem *copy_particlesystem(ParticleSystem *psys)
psysn->pdd = NULL;
psysn->effectors = NULL;
psysn->tree = NULL;
+ psysn->bvhtree = NULL;
BLI_listbase_clear(&psysn->pathcachebufs);
BLI_listbase_clear(&psysn->childcachebufs);