kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

add foreachIDLink function for cloth, remove cloth specific newlibadr calls in readfile.

Browse Source
This commit is contained in:
Campbell Barton 2011-06-09 02:47:22 +00:00
parent 43ec34f054
commit e7e1bc4ca1
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenloader/intern/readfile.c
View File

@ -3847,16 +3847,6 @@ static void lib_link_object(FileData *fd, Main *main)
} }
} }
{
ClothModifierData *clmd = (ClothModifierData *)modifiers_findByType(ob, eModifierType_Cloth);
if(clmd)
{
clmd->sim_parms->effector_weights->group = newlibadr(fd, ob->id.lib, clmd->sim_parms->effector_weights->group);
clmd->coll_parms->group= newlibadr(fd, ob->id.lib, clmd->coll_parms->group);
}
}
/* texture field */ /* texture field */
if(ob->pd) if(ob->pd)
lib_link_partdeflect(fd, &ob->id, ob->pd); lib_link_partdeflect(fd, &ob->id, ob->pd);

15
source/blender/modifiers/intern/MOD_cloth.c
View File

@ -190,6 +190,19 @@ static void freeData(ModifierData *md)
} }
} }
static void foreachIDLink(ModifierData *md, Object *ob,
IDWalkFunc walk, void *userData)
{
ClothModifierData *clmd = (ClothModifierData*) md;
if(clmd->coll_parms) {
walk(userData, ob, (ID **)&clmd->coll_parms->group);
}
if(clmd->sim_parms && clmd->sim_parms->effector_weights) {
walk(userData, ob, (ID **)&clmd->sim_parms->effector_weights->group);
}
}
ModifierTypeInfo modifierType_Cloth = { ModifierTypeInfo modifierType_Cloth = {
/* name */ "Cloth", /* name */ "Cloth",
@ -215,5 +228,5 @@ ModifierTypeInfo modifierType_Cloth = {
/* dependsOnTime */ dependsOnTime, /* dependsOnTime */ dependsOnTime,
/* dependsOnNormals */ NULL, /* dependsOnNormals */ NULL,
/* foreachObjectLink */ NULL, /* foreachObjectLink */ NULL,
/* foreachIDLink */ NULL, /* foreachIDLink */ foreachIDLink,
}; };