Merge with blender svn -> svn merge -r 12064:12150 https://svn.blender.org/svnroot...
[blender-staging.git] / source / blender / src / editobject.c
index 81a111e62c2b0f4ddfb2d0ae6ff699d7129fc422..1062649a8f2b910e42d782e86646f1e1595f13b3 100644 (file)
@@ -2063,7 +2063,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);
@@ -2072,7 +2072,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);
        }
 }
 
@@ -3539,7 +3539,7 @@ void make_links(short event)
                        return;                 
                }
                else {
-                       event= pupmenu(strp);
+                       event= pupmenu_col(strp, 20);
                        MEM_freeN(strp);
                
                        if(event<= 0) return;