diff options
| author | Ian Thompson <quornian@googlemail.com> | 2008-06-09 18:04:19 +0400 |
|---|---|---|
| committer | Ian Thompson <quornian@googlemail.com> | 2008-06-09 18:04:19 +0400 |
| commit | 10d59e720827660ab73801165c3c0925a27c5101 (patch) | |
| tree | 36e45ee082b1abdcfcb64906a604fcda9119060d /source/blender/blenloader/intern | |
| parent | 7fd8c2424f339dfad88745e7d39b3ddcb8b484fc (diff) | |
Merged from trunk
svn merge -r14988:15170 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1cb8b10b087..7d0dd9e41c1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3108,7 +3108,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) collmd->current_v = NULL; collmd->time = -1; collmd->numverts = 0; - collmd->bvh = NULL; + collmd->bvhtree = NULL; collmd->mfaces = NULL; } |