From adef239fc0f4603513ba92aa3095bbb7249f3d01 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Mon, 24 Sep 2007 03:03:43 +0000 Subject: [PATCH] * Changed the "Make Links -> To Scene..." menu to use a columned popup menu - more manageable when you've got a lot of scenes. Also changed an error message from using a popup menu to the proper error() function with icon etc. --- source/blender/src/editobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 44b93789690..244eaad037c 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -2059,7 +2059,7 @@ void docenter(int centermode) /* Warn if any errors occured */ if (tot_lib_error+tot_key_error+tot_multiuser_arm_error) { char err[512]; - sprintf(err, "Warning %i Object(s) Not Centered, %i Changed%%t", tot_lib_error+tot_key_error+tot_multiuser_arm_error, tot_change); + sprintf(err, "Warning %i Object(s) Not Centered, %i Changed:", tot_lib_error+tot_key_error+tot_multiuser_arm_error, tot_change); if (tot_lib_error) sprintf(err+strlen(err), "|%i linked library objects", tot_lib_error); @@ -2068,7 +2068,7 @@ void docenter(int centermode) if (tot_multiuser_arm_error) sprintf(err+strlen(err), "|%i multiuser armature object(s)", tot_multiuser_arm_error); - pupmenu(err); + error(err); } } @@ -3535,7 +3535,7 @@ void make_links(short event) return; } else { - event= pupmenu(strp); + event= pupmenu_col(strp, 20); MEM_freeN(strp); if(event<= 0) return;