diff options
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.cc')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 031de3e4ef2..0f1abf52e6f 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -252,7 +252,7 @@ static void mesh_cd_calc_active_uv_layer(const Object *object, { const Mesh *me_final = editmesh_final_or_this(object, me); const CustomData *cd_ldata = mesh_cd_ldata_get_from_mesh(me_final); - int layer = CustomData_get_active_layer(cd_ldata, CD_MLOOPUV); + int layer = CustomData_get_active_layer(cd_ldata, CD_PROP_FLOAT2); if (layer != -1) { cd_used->uv |= (1 << layer); } @@ -264,7 +264,7 @@ static void mesh_cd_calc_active_mask_uv_layer(const Object *object, { const Mesh *me_final = editmesh_final_or_this(object, me); const CustomData *cd_ldata = mesh_cd_ldata_get_from_mesh(me_final); - int layer = CustomData_get_stencil_layer(cd_ldata, CD_MLOOPUV); + int layer = CustomData_get_stencil_layer(cd_ldata, CD_PROP_FLOAT2); if (layer != -1) { cd_used->uv |= (1 << layer); } @@ -318,7 +318,7 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object, * We do it based on the specified name. */ if (name[0] != '\0') { - layer = CustomData_get_named_layer(cd_ldata, CD_MLOOPUV, name); + layer = CustomData_get_named_layer(cd_ldata, CD_PROP_FLOAT2, name); type = CD_MTFACE; #if 0 /* Tangents are always from UV's - this will never happen. */ @@ -360,8 +360,9 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object, switch (type) { case CD_MTFACE: { if (layer == -1) { - layer = (name[0] != '\0') ? CustomData_get_named_layer(cd_ldata, CD_MLOOPUV, name) : - CustomData_get_render_layer(cd_ldata, CD_MLOOPUV); + layer = (name[0] != '\0') ? + CustomData_get_named_layer(cd_ldata, CD_PROP_FLOAT2, name) : + CustomData_get_render_layer(cd_ldata, CD_PROP_FLOAT2); } if (layer != -1) { cd_used.uv |= (1 << layer); @@ -370,12 +371,13 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object, } case CD_TANGENT: { if (layer == -1) { - layer = (name[0] != '\0') ? CustomData_get_named_layer(cd_ldata, CD_MLOOPUV, name) : - CustomData_get_render_layer(cd_ldata, CD_MLOOPUV); + layer = (name[0] != '\0') ? + CustomData_get_named_layer(cd_ldata, CD_PROP_FLOAT2, name) : + CustomData_get_render_layer(cd_ldata, CD_PROP_FLOAT2); /* Only fallback to orco (below) when we have no UV layers, see: T56545 */ if (layer == -1 && name[0] != '\0') { - layer = CustomData_get_render_layer(cd_ldata, CD_MLOOPUV); + layer = CustomData_get_render_layer(cd_ldata, CD_PROP_FLOAT2); } } if (layer != -1) { |