griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T51919: Tangents need UV's allocated

Browse Source
This commit is contained in:
Campbell Barton
2017-06-30 17:48:18 +10:00
parent bc347f6015
commit 34e4948682
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@@ -305,9 +305,6 @@ static void mesh_cd_calc_used_gpu_layers(
}
if (layer != -1) {
cd_lused[CD_TANGENT] |= (1 << layer);
/* TODO(campbell): investigate why this is needed T51919. */
cd_lused[CD_MLOOPUV] |= (1 << layer);
}
break;
}
@@ -1737,7 +1734,7 @@ static Gwn_VertBuf *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata,
unsigned int vidx = 0;
const char *attrib_name;
if (rdata->cd.layers.uv_len + rdata->cd.layers.vcol_len == 0) {
if (rdata->cd.layers.uv_len + rdata->cd.layers.tangent_len + rdata->cd.layers.vcol_len == 0) {
return NULL;
}
@@ -1748,7 +1745,7 @@ static Gwn_VertBuf *mesh_batch_cache_get_tri_shading_data(MeshRenderData *rdata,
/* initialize vertex format */
unsigned int *uv_id = MEM_mallocN(sizeof(*uv_id) * rdata->cd.layers.uv_len, "UV attrib format");
unsigned int *vcol_id = MEM_mallocN(sizeof(*vcol_id) * rdata->cd.layers.vcol_len, "Vcol attrib format");
unsigned int *tangent_id = MEM_mallocN(sizeof(*tangent_id) * rdata->cd.layers.uv_len, "Tangent attrib format");
unsigned int *tangent_id = MEM_mallocN(sizeof(*tangent_id) * rdata->cd.layers.tangent_len, "Tangent attrib format");
for (int i = 0; i < rdata->cd.layers.uv_len; i++) {
/* UV */