Mercurial > octave
diff src/gl-render.cc @ 11168:36442102c340
Fix treatment of facevertexcdata if facecolor is 'none' with the fltk backend
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Fri, 29 Oct 2010 21:46:58 +0200 |
| parents | 9cdf43d1fa16 |
| children | c0a95a5c6d25 |
line wrap: on
line diff
--- a/src/gl-render.cc Thu Oct 28 14:12:46 2010 +0200 +++ b/src/gl-render.cc Fri Oct 29 21:46:58 2010 +0200 @@ -2449,13 +2449,15 @@ bool has_facecolor = false; bool has_facealpha = false; - int fc_mode = (props.facecolor_is_rgb () ? 0 : + int fc_mode = ((props.facecolor_is("none") + || props.facecolor_is_rgb ()) ? 0 : (props.facecolor_is("flat") ? 1 : 2)); int fl_mode = (props.facelighting_is ("none") ? 0 : (props.facelighting_is ("flat") ? 1 : 2)); int fa_mode = (props.facealpha_is_double () ? 0 : (props.facealpha_is ("flat") ? 1 : 2)); - int ec_mode = (props.edgecolor_is_rgb () ? 0 : + int ec_mode = ((props.edgecolor_is("none") + || props.edgecolor_is_rgb ()) ? 0 : (props.edgecolor_is("flat") ? 1 : 2)); int el_mode = (props.edgelighting_is ("none") ? 0 : (props.edgelighting_is ("flat") ? 1 : 2));