Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for crash on load if the file was saved in editmesh,

Browse Source 
BKE_mesh_uv_cdlayer_rename_index was checking editmesh pointer before it was NULL'd by direct_link_mesh.
This commit is contained in:
Campbell Barton
2013-10-07 16:48:26 +00:00
parent 098207e634
commit 6aedad4bff
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -372,7 +372,7 @@ if(APPLE)
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
endif()
if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")

12
source/blender/blenloader/intern/readfile.c
View File

@@ -4164,12 +4164,6 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
direct_link_customdata(fd, &mesh->fdata, mesh->totface);
direct_link_customdata(fd, &mesh->ldata, mesh->totloop);
direct_link_customdata(fd, &mesh->pdata, mesh->totpoly);
if (mesh->mloopuv || mesh->mtpoly) {
/* for now we have to ensure texpoly and mloopuv layers are aligned
* in the future we may allow non-aligned layers */
BKE_mesh_cd_validate(mesh);
}
mesh->bb = NULL;
mesh->edit_btmesh = NULL;
@@ -4179,6 +4173,12 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh)
mesh->totselect = 0;
}
if (mesh->mloopuv || mesh->mtpoly) {
/* for now we have to ensure texpoly and mloopuv layers are aligned
* in the future we may allow non-aligned layers */
BKE_mesh_cd_validate(mesh);
}
/* Multires data */
mesh->mr= newdataadr(fd, mesh->mr);
if (mesh->mr) {