diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-30 04:23:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-30 04:23:11 +0400 |
| commit | c5a3f361a008f9b84e88dae4cfbd556d3a3ca76c (patch) | |
| tree | 35380486c3f0675924bb241d9c01565ca8f04dba /source/blender/blenkernel/BKE_DerivedMesh.h | |
| parent | c9063388bf374978e0dda7e5f82141d5de3cdb62 (diff) | |
| parent | 099760cf1f7969d1cd16c6b5bd1a77d86bc62547 (diff) | |
svn merge -r39765:39781 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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index fae7e1492a2..73f0602cf3e 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -338,7 +338,8 @@ struct DerivedMesh { int (*setDrawOptions)(void *userData, int index, int *drawSmooth_r), void *userData, int useColors, - int (*setMaterial)(int, void *attribs)); + int (*setMaterial)(int, void *attribs), + int (*compareDrawOptions)(void *userData, int cur_index, int next_index)); /* Draw mapped faces using MTFace * o Drawing options too complicated to enumerate, look at code. |