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/render/intern/include/render_types.h | |
| parent | 1ad0cc6bde4746949eee7a9babb97178a05816c3 (diff) | |
| parent | 1fb30758034c2f83862bb7fc5f30a1a4d7b4510b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index b1b95933584..1de1f23f351 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -337,7 +337,7 @@ typedef struct ObjectRen { char (*mcol)[MAX_CUSTOMDATA_LAYER_NAME]; int actmtface, actmcol, bakemtface; - char tangent_mask; /* which tangent layer should be calculated */ + short tangent_mask; /* which tangent layer should be calculated */ float obmat[4][4]; /* only used in convertblender.c, for instancing */ |