Fix T51963: Eevee: ASAN crash on copy_attrib_name

Bug introduced on f6bb3262f1.

CustomData_get_named_layer returns a different result than
CustomData_get_named_layer_index.
This commit is contained in:
Dalai Felinto 2017-07-03 12:46:58 +02:00
parent 3de5370e9d
commit 871325e26f
Notes: blender-bot 2023-02-14 06:49:52 +01:00
Referenced by issue #51963, Eevee: ASAN crash on copy_attrib_name
1 changed files with 5 additions and 4 deletions

View File

@ -261,16 +261,17 @@ static void mesh_cd_calc_used_gpu_layers(
*
* We do it based on the specified name.
*/
if (name[0]) {
layer = CustomData_get_named_layer_index(cd_ldata, CD_MLOOPUV, name);
if (name[0] != '\0') {
layer = CustomData_get_named_layer(cd_ldata, CD_MLOOPUV, name);
type = CD_MTFACE;
if (layer == -1) {
layer = CustomData_get_named_layer_index(cd_ldata, CD_MLOOPCOL, name);
layer = CustomData_get_named_layer(cd_ldata, CD_MLOOPCOL, name);
type = CD_MCOL;
}
#if 0 /* Tangents are always from UV's - this will never happen. */
if (layer == -1) {
layer = CustomData_get_named_layer_index(cd_ldata, CD_TANGENT, name);
layer = CustomData_get_named_layer(cd_ldata, CD_TANGENT, name);
type = CD_TANGENT;
}
#endif