[Bf-blender-cvs] [a749d7d8fac] master: Fix T59304: boolean modifier does not preserve UV textures.

[Brecht Van Lommel]

Commit: a749d7d8facdf8b49cef25ee6fd1a3ecea9b09b5
Author: Brecht Van Lommel
Date:   Fri Mar 8 14:09:54 2019 +0100
Branches: master
https://developer.blender.org/rBa749d7d8facdf8b49cef25ee6fd1a3ecea9b09b5

Fix T59304: boolean modifier does not preserve UV textures.

In the old derivedmesh function it was merging customdata layers, added
that back for mesh conversion too.

===================================================================

M	source/blender/bmesh/intern/bmesh_mesh_conv.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c
index 8254b8a2202..4dc6cc8b965 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_conv.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c
@@ -219,6 +219,12 @@ void BM_mesh_bm_from_me(
 		CustomData_copy(&me->ldata, &bm->ldata, mask.lmask, CD_CALLOC, 0);
 		CustomData_copy(&me->pdata, &bm->pdata, mask.pmask, CD_CALLOC, 0);
 	}
+	else {
+		CustomData_bmesh_merge(&me->vdata, &bm->vdata, mask.vmask, CD_CALLOC, bm, BM_VERT);
+		CustomData_bmesh_merge(&me->edata, &bm->edata, mask.emask, CD_CALLOC, bm, BM_EDGE);
+		CustomData_bmesh_merge(&me->ldata, &bm->ldata, mask.lmask, CD_CALLOC, bm, BM_LOOP);
+		CustomData_bmesh_merge(&me->pdata, &bm->pdata, mask.pmask, CD_CALLOC, bm, BM_FACE);
+	}
 
 	/* -------------------------------------------------------------------- */
 	/* Shape Key */