From be1746694217efa4bbf7121d92f84db74d9e419d Mon Sep 17 00:00:00 2001 From: Janne Karhu Date: Tue, 19 Apr 2011 16:30:55 +0000 Subject: Fix for [#27038] Bugs when linking particles/collision/softbody modifiers * Collision modifiers are disabled here by intention, but particles and softbody were copied the wrong way over :) * On a further note I don't really get this whole "link modifiers" thing as it just copies the modifiers. As modifiers aren't ID blocks there's no sense in calling this linking! * Secondly I don't think particles, smoke etc should be considered as modifiers here at all, meaning they shouldn't be linked/copied. These "modifiers" only read the mesh data at a certain location of the stack, but don't actually modify the mesh in any way (more info here http://wiki.blender.org/index.php/User:Jhk#Modifier_Stack_proposal). --- source/blender/blenkernel/intern/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 58d8cde7cb3..74f66837b44 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -208,8 +208,8 @@ void object_link_modifiers(struct Object *ob, struct Object *from) BLI_addtail(&ob->modifiers, nmd); } - copy_object_particlesystems(from, ob); - copy_object_softbody(from, ob); + copy_object_particlesystems(ob, from); + copy_object_softbody(ob, from); // TODO: smoke?, cloth? } -- cgit v1.2.3