diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-14 23:47:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-14 23:47:02 +0300 |
commit | 639dd6d25ec07535c8b856d527ffcc75c9a7b6d2 (patch) | |
tree | 6744eb81067e7a9d1986ce0434688b027500a9cd /source | |
parent | 231ddb67b120f064f859cd29f2a7e3b54eae5098 (diff) |
Fix #20362: multires conversion from 2.5alpha0 not working. It's still not
entirely the same, the tangets are a bit different at face edges/corners.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 139a8d3267f..88c6788b723 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -784,6 +784,11 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp) for(x = 0; x < newside; ++x, ++out) { old_mdisps_rotate(S, newside, oldside, x, y, &u, &v); old_mdisps_bilinear(*out, mdisp->disps, oldside, u, v); + + if(S == 1) { (*out)[1]= -(*out)[1]; } + else if(S == 2) { SWAP(float, (*out)[0], (*out)[1]); } + else if(S == 3) { (*out)[0]= -(*out)[0]; } + else if(S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0]= -(*out)[0]; (*out)[1]= -(*out)[1]; }; } } } |