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

Merged changes in the trunk up to revision 25613.

Browse Source
This commit is contained in:
Tamito Kajiyama
2009-12-29 21:46:36 +00:00
parent 3bc3e454f0 7831edbc59
commit 05603fa110
294 changed files with 19336 additions and 17280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1695,12 +1695,6 @@ static void lib_link_fmodifiers(FileData *fd, ID *id, ListBase *list)
data->script = newlibadr(fd, id->lib, data->script);
}
break;
case FMODIFIER_TYPE_SOUND:
{
FMod_Sound *data= (FMod_Sound *)fcm->data;
data->sound = newlibadr(fd, id->lib, data->sound);
}
break;
}
}
}
@@ -10315,6 +10309,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
/* put 2.50 compatibility code here until next subversion bump */
if (1) {
Scene *sce;
for(sce = main->scene.first; sce; sce = sce->id.next) {
sce->gm.eyeseparation = 0.10;
}
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
@@ -10668,13 +10669,6 @@ static void expand_fmodifiers(FileData *fd, Main *mainvar, ListBase *list)
expand_doit(fd, mainvar, data->script);
}
break;
case FMODIFIER_TYPE_SOUND:
{
FMod_Sound *data= (FMod_Sound *)fcm->data;
expand_doit(fd, mainvar, data->sound);
}
break;
}
}
}