archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 54110.

Browse Source 
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
This commit is contained in:
Tamito Kajiyama
2013-01-26 23:49:13 +00:00
parent 9251d628db c84383301c
commit 556912792a
748 changed files with 31619 additions and 23270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/bpath.c
View File

@@ -462,6 +462,10 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int
OceanModifierData *omd = (OceanModifierData *) md;
rewrite_path_fixed(omd->cachepath, visit_cb, absbase, bpath_user_data);
}
else if (md->type == eModifierType_MeshCache) {
MeshCacheModifierData *mcmd = (MeshCacheModifierData *) md;
rewrite_path_fixed(mcmd->filepath, visit_cb, absbase, bpath_user_data);
}
}
if (ob->soft) {