diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 21:59:02 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 22:16:34 +0300 |
| commit | 3fc342bda03c3882210c036b7ee8cd6d89ab7400 (patch) | |
| tree | 81143530d8f1fba121424c9966cfbf6baa1c5bf8 /source/blender/blenkernel/intern/mesh_tangent.c | |
| parent | de2faa395f2d0b014a70d7741a4a49d3a6be6302 (diff) | |
Fix building with gcc6 after merge from master
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_tangent.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_tangent.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |