svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875

2009-08-29 23:41:09 +00:00
parent c2696ae631 d7bf9688ac
commit 75697c40a0
11 changed files with 1007 additions and 59 deletions
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -6367,6 +6367,17 @@ static Base *object_add_duplicate_internal(Scene *scene, Base *base, int dupflag
 				}
 			}
 		}
+		if(dupflag & USER_DUP_PSYS) {
+			ParticleSystem *psys;
+			for(psys=obn->particlesystem.first; psys; psys=psys->next) {
+				id= (ID*) psys->part;
+				if(id) {
+					ID_NEW_US(psys->part)
+					else psys->part= psys_copy_settings(psys->part);
+					id->us--;
+				}
+			}
+		}
 		
 		id= obn->data;
 		didit= 0;