diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:49:35 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:53:00 +0300 |
| commit | e1482841dd5dd55cb453d37d115ec80f44c02316 (patch) | |
| tree | 63cee90e2ab7b4316b4e36ffeb181700e99d6aab /source/blender/blenkernel/BKE_DerivedMesh.h | |
| parent | 1ad0cc6bde4746949eee7a9babb97178a05816c3 (diff) | |
| parent | 1fb30758034c2f83862bb7fc5f30a1a4d7b4510b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 116724463ca..78c2efcc8a2 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -199,7 +199,7 @@ struct DerivedMesh { /* use for converting to BMesh which doesn't store bevel weight and edge crease by default */ char cd_flag; - char tangent_mask; /* which tangent layers are calculated */ + short tangent_mask; /* which tangent layers are calculated */ /** Calculate vert and face normals */ void (*calcNormals)(DerivedMesh *dm); @@ -768,6 +768,10 @@ void DM_calc_tangents_names_from_gpu( const struct GPUVertexAttribs *gattribs, char (*tangent_names)[MAX_NAME], int *tangent_names_count); +void DM_add_named_tangent_layer_for_uv( + CustomData *uv_data, CustomData *tan_data, int numLoopData, + const char *layer_name); + void DM_calc_loop_tangents( DerivedMesh *dm, bool calc_active_tangent, const char (*tangent_names)[MAX_NAME], int tangent_names_count); |