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

* bugfix, old files (including default cube) weren't loading up with

Browse Source 
correctly initialised volume settings
This commit is contained in:
Matt Ebb
2008-09-23 08:00:55 +00:00
parent 340c3b945e
commit 45acf427a7
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7720,7 +7720,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
Scene *sce= main->scene.first;
Sequence *seq;
Editing *ed;
Material *ma;
while(sce) {
ed= sce->ed;
@@ -7735,17 +7734,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
sce= sce->id.next;
}
for(ma=main->mat.first; ma; ma= ma->id.next) {
/* trigger for non-volumetric file */
if (ma->vol_shade_stepsize < 0.0001f) {
ma->vol_shade_stepsize = 0.2f;
ma->vol_stepsize = 0.2f;
ma->vol_absorption = 1.0f;
ma->vol_scattering = 1.0f;
ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
}
}
}
/*fix broken group lengths in id properties*/
@@ -7869,6 +7857,22 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
la->skyblendtype= MA_RAMP_ADD;
la->skyblendfac= 1.0f;
}
}
if (main->versionfile <= 247) {
Material *ma;
for(ma=main->mat.first; ma; ma= ma->id.next) {
/* trigger for non-volumetric file */
if (ma->vol_shade_stepsize < 0.0001f) {
ma->vol_shade_stepsize = 0.2f;
ma->vol_stepsize = 0.2f;
ma->vol_absorption = 1.0f;
ma->vol_scattering = 1.0f;
ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
}
}
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */