diff options
Diffstat (limited to 'src/engine/octaedit.cpp')
| -rw-r--r-- | src/engine/octaedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/octaedit.cpp b/src/engine/octaedit.cpp index 3092221..af69db9 100644 --- a/src/engine/octaedit.cpp +++ b/src/engine/octaedit.cpp @@ -1987,7 +1987,7 @@ void mpeditface(int dir, int mode, selinfo &sel, bool local) solidfaces(c); cube &o = blockcube(x, y, 1, sel, -sel.grid); loopi(6) - c.texture[i] = o.children ? DEFAULT_GEOM : o.texture[i]; + c.texture[i] = o.children ? (int) DEFAULT_GEOM : (int) o.texture[i]; } else emptyfaces(c); @@ -2714,7 +2714,7 @@ void mpeditmat(int matid, int filter, selinfo &sel, bool local) if(filter >= 0) { filtermat = filter&0xFFFF; - filtermask = filtermat&(MATF_VOLUME|MATF_INDEX) ? MATF_VOLUME|MATF_INDEX : (filtermat&MATF_CLIP ? MATF_CLIP : filtermat); + filtermask = filtermat&(MATF_VOLUME|MATF_INDEX) ? (int) MATF_VOLUME|MATF_INDEX : (filtermat&MATF_CLIP ? (int) MATF_CLIP : (int) filtermat); filtergeom = filter&~0xFFFF; } if(matid < 0) |