Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2007-09-24 07:03:43 +0400
committerMatt Ebb <matt@mke3.net>2007-09-24 07:03:43 +0400
commitadef239fc0f4603513ba92aa3095bbb7249f3d01 (patch)
tree7a328cbcd91aa27cec3c2b488618c2c72b75f5e0 /source/blender/src/editobject.c
parent091d1e15a91d73b4ec369a3becec61d21bb21570 (diff)
* 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.
Diffstat (limited to 'source/blender/src/editobject.c')
-rw-r--r--source/blender/src/editobject.c6
1 files 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;