diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-13 09:39:27 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-13 09:39:27 +0400 |
| commit | 60d3b8f27b31fea67a91184868b20ed95bab458a (patch) | |
| tree | 5089854f068c26ba026e16e07c580ac2d40ee743 /source/blender/blenloader | |
| parent | e9358a38060fefe280018e8ac62e142dabc32a0d (diff) | |
Fix loading external MDisps, BMesh merge bug.
* When converting mfaces to mpolys, load external MDisp data in, add
CustomDataExternal struct to loopdata if needed.
* Fix multires modifier's filepath RNA functions to use ldata rather
than fdata.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 60f4f3c0f31..e9a5dada044 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3708,7 +3708,14 @@ static void lib_link_mesh(FileData *fd, Main *main) /*check if we need to convert mfaces to mpolys*/ if (me->totface && !me->totpoly) { + /* temporarily switch main so that reading from + external CustomData works */ + Main *gmain = G.main; + G.main = main; + BKE_mesh_convert_mfaces_to_mpolys(me); + + G.main = gmain; } /* |