diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 10:30:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 10:30:14 +0400 |
| commit | 55a560c0c4578de7d7378fdc3a3f533adce05b8c (patch) | |
| tree | e0591531a26140e65748ca9853dd497af19a802a /source/blender/blenkernel/BKE_DerivedMesh.h | |
| parent | ec5d518300ec981d902fae6a45454ff0ae94269a (diff) | |
| parent | 0b23d378fbac8e76d4885c3485a4dbf158aab136 (diff) | |
svn merge -r39286:39385 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index bac5bd7d4e4..fae7e1492a2 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -607,7 +607,7 @@ void weight_to_rgb(float input, float *fr, float *fg, float *fb); typedef struct DMVertexAttribs { struct { struct MTFace *array; - int emOffset, glIndex; + int emOffset, glIndex, glTexco; } tface[MAX_MTFACE]; struct { @@ -622,7 +622,7 @@ typedef struct DMVertexAttribs { struct { float (*array)[3]; - int emOffset, glIndex; + int emOffset, glIndex, glTexco; } orco; int tottface, totmcol, tottang, totorco; |