diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-09-22 23:12:53 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-09-22 23:12:53 +0400 |
| commit | 18e50e166e8d9497e00cf9cc2a29d3b31390cf84 (patch) | |
| tree | 1b269f33d65ffa493699014bb3feb66c9a652667 /source/blender/blenloader/intern/readfile.c | |
| parent | f29f335ad53064c0ddf617c3709a2b593e1d45ec (diff) | |
Bugfix #3075
Wave Effect (and build etc) was being converted while the code later on
was reading existing modifiers (and unlinking the converted data).
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 26adb6cf169..e7f9c00e8d2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2319,6 +2319,10 @@ static void direct_link_object(FileData *fd, Object *ob) ob->mat= newdataadr(fd, ob->mat); test_pointer_array(fd, (void **)&ob->mat); + + /* do it here, below old data gets converted */ + direct_link_modifiers(fd, &ob->modifiers); + link_list(fd, &ob->effect); paf= ob->effect.first; while(paf) { @@ -2427,8 +2431,6 @@ static void direct_link_object(FileData *fd, Object *ob) act= act->next; } - direct_link_modifiers(fd, &ob->modifiers); - link_list(fd, &ob->hooks); while (ob->hooks.first) { ObHook *hook = ob->hooks.first; |