diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 20:55:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-13 20:55:07 +0400 |
| commit | 16710fb3c21f1e405fee58640f3e68f2e1fa6251 (patch) | |
| tree | 240ca993013b827569b9543147e18a1235b2d9f8 /source/blender/blenlib/BLI_scanfill.h | |
| parent | 068c62701375e51445a768ab69b74802338f57c1 (diff) | |
| parent | 62cd927f57b94292139348b0a803288e8eafe850 (diff) | |
svn merge -r36651:36672 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenlib/BLI_scanfill.h')
| -rw-r--r-- | source/blender/blenlib/BLI_scanfill.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h index b0ed9271132..0c5e6db1826 100644 --- a/source/blender/blenlib/BLI_scanfill.h +++ b/source/blender/blenlib/BLI_scanfill.h @@ -55,7 +55,7 @@ struct EditVert *BLI_addfillvert(float *vec); struct EditEdge *BLI_addfilledge(struct EditVert *v1, struct EditVert *v2); int BLI_begin_edgefill(void); -int BLI_edgefill(int mat_nr); +int BLI_edgefill(short mat_nr); void BLI_end_edgefill(void); /* These callbacks are needed to make the lib finction properly */ |