* Changed the "Make Links -> To Scene..." menu to use a columned
authorMatt Ebb <matt@mke3.net>
Mon, 24 Sep 2007 03:03:43 +0000 (03:03 +0000)
committerMatt Ebb <matt@mke3.net>
Mon, 24 Sep 2007 03:03:43 +0000 (03:03 +0000)
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

index 44b937896903f32d2c548e5790af1c269370440f..244eaad037c412e3750317c8581951c8f036f980 100644 (file)
@@ -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;