svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / src / toolbox.c

diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index f9585eff7837d9337f672b653db1ae335a3548b3..f56434c8c4eec833c133b13040d15dc908b83d56 100644 (file)
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -169,6 +169,28 @@ void asciitoraw(int ch, unsigned short *event, unsigned short *qual)
 
 /* this va_ stuff allows printf() style codes in these menus */
 
+static int vconfirm_choice(char *title, char *itemfmt, va_list ap)
+{
+       char *s, buf[512];
+
+       s= buf;
+       if (title) s+= sprintf(s, "%s%%t|", title);
+       vsprintf(s, itemfmt, ap);
+       
+       return (pupmenu(buf));
+}
+int confirm_choice(char *title, char *itemfmt, ...)
+{
+       va_list ap;
+       int ret;
+       
+       va_start(ap, itemfmt);
+       ret= vconfirm_choice(title, itemfmt, ap);
+       va_end(ap);
+       
+       return ret;
+}
+
 static int vconfirm(char *title, char *itemfmt, va_list ap)
 {
        char *s, buf[512];