Commit: 3fc342bda03c3882210c036b7ee8cd6d89ab7400
Author: Dalai Felinto
Date: Mon Jul 3 20:59:02 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB3fc342bda03c3882210c036b7ee8cd6d89ab7400
Fix building with gcc6 after merge from master
===================================================================
M source/blender/blenkernel/intern/mesh_tangent.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_tangent.c
b/source/blender/blenkernel/intern/mesh_tangent.c
index ecf2766663f..294ed604885 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.c
+++ b/source/blender/blenkernel/intern/mesh_tangent.c
@@ -526,7 +526,7 @@ void BKE_mesh_calc_loop_tangent_step_0(
add = true;
}
if (add)
- *rtangent_mask |= (char)(1 << n);
+ *rtangent_mask |= (short)(1 << n);
}
if (uv_layer_num == 0)
@@ -649,7 +649,7 @@ void BKE_mesh_calc_loop_tangent_ex(
int uv_start =
CustomData_get_layer_index(loopdata, CD_MLOOPUV);
BLI_assert(uv_ind != -1 && uv_start != -1);
BLI_assert(uv_ind - uv_start < MAX_MTFACE);
- *tangent_mask_curr_p |= 1 << (uv_ind -
uv_start);
+ *tangent_mask_curr_p |= (short)(1 <<
(uv_ind - uv_start));
}
mesh2tangent->tangent =
loopdata_out->layers[index].data;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
