Commit: 871325e26fe12efe8bf8a7042d94896f2f7faf6c
Author: Dalai Felinto
Date: Mon Jul 3 12:46:58 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB871325e26fe12efe8bf8a7042d94896f2f7faf6c
Fix T51963: Eevee: ASAN crash on copy_attrib_name
Bug introduced on f6bb3262f17.
CustomData_get_named_layer returns a different result than
CustomData_get_named_layer_index.
===================================================================
M source/blender/draw/intern/draw_cache_impl_mesh.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 48730afdacc..663deaeac3b 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
