# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1334454514 25200
# Node ID c973d4637659aec8bafc5a7fc10b992597e4412c
# Parent  26b2983a8acd6512c10a9ef92a139e36f059351e# Parent  05b7fa3b64c8a8b62c5fa08b491ff19c6f2cbb62
maint: Periodic merge of stable to default.

diff -r 26b2983a8acd -r c973d4637659 src/graphics.in.h
--- a/src/graphics.in.h	Fri Apr 13 14:07:45 2012 -0400
+++ b/src/graphics.in.h	Sat Apr 14 18:48:34 2012 -0700
@@ -4664,7 +4664,7 @@
       string_property ydatasource , ""
       string_property zdatasource , ""
       string_property cdatasource , ""
-      color_property facecolor , "{flat}|none|interp"
+      color_property facecolor , "{flat}|none|interp|texturemap"
       double_radio_property facealpha , double_radio_property (1.0, radio_values ("flat|interp"))
       color_property edgecolor , color_property (color_values (0, 0, 0), radio_values ("flat|none|interp"))
       radio_property linestyle , "{-}|--|:|-.|none"