[Bf-blender-cvs] [1a6491639a8] master: Fix T68954 UVEdit: Auto Smooth option conflicts with uvs display

[Clément Foucault]

Commit: 1a6491639a8b14ec59aa8b54e9d46d7b0cb7f5ff
Author: Clément Foucault
Date:   Mon Aug 26 16:28:32 2019 +0200
Branches: master
https://developer.blender.org/rB1a6491639a8b14ec59aa8b54e9d46d7b0cb7f5ff

Fix T68954 UVEdit: Auto Smooth option conflicts with uvs display

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

M	source/blender/draw/intern/draw_cache_extract_mesh.c

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

diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c
index b0a0766eedb..7753b349032 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.c
@@ -2577,7 +2577,7 @@ static void *extract_edituv_data_init(const MeshRenderData *mr, void *buf)
   GPU_vertbuf_init_with_format(vbo, &format);
   GPU_vertbuf_data_alloc(vbo, mr->loop_len);
 
-  CustomData *cd_ldata = &mr->me->ldata;
+  CustomData *cd_ldata = (mr->extract_type == MR_EXTRACT_BMESH) ? &mr->bm->ldata : &mr->me->ldata;
 
   MeshExtract_EditUVData_Data *data = MEM_callocN(sizeof(*data), __func__);
   data->vbo_data = (EditLoopData *)vbo->data;