Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-09-02 16:33:29 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-09-02 16:33:29 +0400
commitb56ffd2cdb51021d1a3456af9e8f4b5451407c61 (patch)
treef51e4af01e685d779ff498b69496f9ff3a0eada1 /source/blender/blenkernel/BKE_DerivedMesh.h
parentfefbdc4376b6bacdaba0ad50da3c706289301b3d (diff)
parent15afd240e04ef3f220b6133cc920d964dbcfcf85 (diff)
Cycles: svn merge -r39669:39870 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 45c4b949809..14198a9a139 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -283,7 +283,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.