diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-14 12:47:20 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 23:09:29 +0300 |
commit | 322dc723165a705c34df1e3246e500da1a9927de (patch) | |
tree | d82e780e36c89b327d58aa2b8ee215ee8a9fd514 /source/blender/draw/intern/draw_cache_impl_mesh.c | |
parent | 007f1b74a67302fb4c164eb26969419434a98aee (diff) |
Cleanup: refactor GPU material attribute and texture requests
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.c')
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index ed60e16c7cc..5b273159cdf 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -142,11 +142,10 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Mesh *me, for (int i = 0; i < gpumat_array_len; i++) { GPUMaterial *gpumat = gpumat_array[i]; if (gpumat) { - GPUVertAttrLayers gpu_attrs; - GPU_material_vertex_attrs(gpumat, &gpu_attrs); - for (int j = 0; j < gpu_attrs.totlayer; j++) { - const char *name = gpu_attrs.layer[j].name; - int type = gpu_attrs.layer[j].type; + ListBase gpu_attrs = GPU_material_attributes(gpumat); + for (GPUMaterialAttribute *gpu_attr = gpu_attrs.first; gpu_attr; gpu_attr = gpu_attr->next) { + const char *name = gpu_attr->name; + int type = gpu_attr->type; int layer = -1; if (type == CD_AUTO_FROM_NAME) { |