svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-09-10 11:04:07 +00:00
parent d2c13039ed 75078d62df
commit 190aae27ae
158 changed files with 6159 additions and 4088 deletions
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -3003,7 +3003,7 @@ void do_effects_panels(unsigned short event)
 		if(ob && (psys=psys_get_current(ob))){
 			if(psys->part) {
 				if(psys->part->id.us>1){
-					if(okee("Make local")){
+					if(okee("Make Single User")){
 						part=psys_copy_settings(psys->part);
 						part->id.us=1;
 						psys->part->id.us--;