diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-07 15:10:00 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-07 15:10:00 +0300 |
| commit | 249b3cca61f2d6978939ef7399a2a8183811af91 (patch) | |
| tree | 7754e424b8f078b38fefca277ed266d9429bd68c /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 429741ac198455564806fdbe351d666258711658 (diff) | |
| parent | e39ec27bbaebcb85b2541e9756b408c554f602cb (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 95466c4872c..0cfb76325fb 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -301,7 +301,11 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, float uv[3] = {0.0f, 0.0f, 0.0f}; /* only first 2 values are written into */ limit[0] = limit[1] = STD_UV_CONNECT_LIMIT; - vmap = BKE_mesh_uv_vert_map_create(mpoly, mloop, mloopuv, totface, totvert, 0, limit, false); + /* previous behaviour here is without accounting for winding, however this causes stretching in + * UV map in really simple cases with mirror + subsurf, see second part of T44530. Also, initially + * intention is to treat merged vertices from mirror modifier as seams, see code below with ME_VERT_MERGED + * This fixes a very old regression (2.49 was correct here) */ + vmap = BKE_mesh_uv_vert_map_create(mpoly, mloop, mloopuv, totface, totvert, 0, limit, true); if (!vmap) return 0; |