diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-15 21:02:56 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-11-15 21:02:56 +0300 |
commit | e56beb5c5f81c26cf33e02f901686a2406ed3ceb (patch) | |
tree | 249e91fef479840702bf78d3accd711e334a2656 /source/blender/blenloader/intern/readfile.c | |
parent | 2a88cabaab1329d17a3c7247014c71f6e1dad58f (diff) |
Remove 'topochange' from EDBM.soc-2014-shapekey
In future, there may be several tools relying on topo hash, each one making
updates to it when it needs. Hence, such thing should absolutely not be held
by mesh data, but (in this case) by Key data.
Also made some reorganization and renaming a bit.
Note: this code compiles, but for now cannot really be tested, since scratch
is not enabled...
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 01af82f124b..2be58e353c6 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3166,7 +3166,9 @@ static void direct_link_key(FileData *fd, Key *key) key->scratch.origin = newdataadr(fd, key->scratch.origin); key->scratch.data = newdataadr(fd, key->scratch.data); - + + key->topohash = NULL; + for (kb = key->block.first; kb; kb = kb->next) { kb->data = newdataadr(fd, kb->data); |