From af162658e1270b7442eb064360d1bec75c621c1a Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 23 Jul 2014 20:06:29 +0200 Subject: Texture painting: Add ability to select UV layer from the layer panel. --- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/material.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index bdfaf9a1be9..c3e8d2a98af 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -517,7 +517,7 @@ MTFace *DM_paint_uvlayer_active_get(DerivedMesh *dm, int mat_nr) BLI_assert(mat_nr < dm->totmat); if (dm->mat[mat_nr] && dm->mat[mat_nr]->texpaintslot && - dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname[0]) + dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname) { tf_base = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, dm->mat[mat_nr]->texpaintslot[dm->mat[mat_nr]->paint_active_slot].uvname); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 27330fb8db3..b4ab464838e 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1388,7 +1388,7 @@ void BKE_texpaint_slot_refresh_cache(Material *ma, bool use_nodes) for (mtex = ma->mtex, i = 0; i < MAX_MTEX; i++, mtex++) { if (get_mtex_slot_valid_texpaint(*mtex)) { ma->texpaintslot[index].ima = (*mtex)->tex->ima; - BLI_strncpy(ma->texpaintslot[index++].uvname, (*mtex)->uvname, 64); + ma->texpaintslot[index++].uvname = (*mtex)->uvname; } } } -- cgit v1.2.3