diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
| commit | 103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb (patch) | |
| tree | 8fd9a6b770998717f4555e7121fb16116b441865 /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | eb21bdd249427465a093a078cda7864309a8f735 (diff) | |
| parent | 869d654cccba8b9b0bc295e7ce89e8e322912023 (diff) | |
Merged changes from trunk r58324-58419.ge_dev
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 9b5e5070342..26a5dada108 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1970,7 +1970,7 @@ static void ccgDM_drawFacesGLSL(DerivedMesh *dm, DMSetMaterial setMaterial) /* Only used by non-editmesh types */ static void ccgDM_drawMappedFacesMat(DerivedMesh *dm, void (*setMaterial)(void *userData, int, void *attribs), - int (*setFace)(void *userData, int index), void *userData) + bool (*setFace)(void *userData, int index), void *userData) { CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm; CCGSubSurf *ss = ccgdm->ss; |