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:
authorNicholas Bishop <nicholasbishop@gmail.com>2007-01-03 10:21:04 +0300
committerNicholas Bishop <nicholasbishop@gmail.com>2007-01-03 10:21:04 +0300
commitb6264c6b0abdf9c4ca016ad7664cc7d61f976c19 (patch)
treefb47fe08e8a9bd6e825dfef7af317b03a3ddce8d /source/blender/blenloader
parent59e44e4afa3adf2946d247d8950383155c476fd2 (diff)
Modified the multires loading code so that it always checks for a NULL edge flag array.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5ca61d21e98..bd8598e2138 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2538,7 +2538,8 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
if(mesh->mr->edge_flags)
mesh->mr->edge_flags= newdataadr(fd, mesh->mr->edge_flags);
- else
+
+ if(!mesh->mr->edge_flags)
mesh->mr->edge_flags= MEM_callocN(sizeof(short)*lvl->totedge, "Multires Edge Flags");
for(; lvl; lvl= lvl->next) {