blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T36994: Make link modifier fails (soft body)

This commit is contained in:
Campbell Barton 2015-06-02 20:23:01 +10:00
parent 7724b26ab2
commit 9454377c71
Notes: blender-bot 2023-02-14 11:46:02 +01:00 
Referenced by issue #36994, make link modifier error(soft body)
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/object.c
View File

@ -264,8 +264,6 @@ void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_sr
if (ELEM(md->type,
eModifierType_Hook,
eModifierType_Softbody,
eModifierType_ParticleInstance,
eModifierType_Collision))
{
continue;
@ -273,10 +271,15 @@ void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_sr
if (!BKE_object_support_modifier_type_check(ob_dst, md->type))
continue;
if (md->type == eModifierType_Skin) {
/* ensure skin-node customdata exists */
BKE_mesh_ensure_skin_customdata(ob_dst->data);
switch (md->type) {
case eModifierType_Softbody:
BKE_object_copy_softbody(ob_dst, ob_src);
break;
case eModifierType_Skin:
/* ensure skin-node customdata exists */
BKE_mesh_ensure_skin_customdata(ob_dst->data);
break;
}
nmd = modifier_new(md->type);
@ -293,7 +296,6 @@ void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_sr
}
BKE_object_copy_particlesystems(ob_dst, ob_src);
BKE_object_copy_softbody(ob_dst, ob_src);
/* TODO: smoke?, cloth? */
}
@ -1379,6 +1381,7 @@ void BKE_object_copy_particlesystems(Object *ob_dst, const Object *ob_src)
void BKE_object_copy_softbody(Object *ob_dst, const Object *ob_src)
{
if (ob_src->soft) {
ob_dst->softflag = ob_src->softflag;
ob_dst->soft = copy_softbody(ob_src->soft, false);
}
}