svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 26 Sep 2008 08:58:15 +0000 (08:58 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 26 Sep 2008 08:58:15 +0000 (08:58 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/shadeinput.c
source/blender/src/buttons_shading.c

index 49ad309695766e404f1d08f5f596d56ae8093d77,66905c6f24025081030a7ec6c392f25f26bab399..e80d2c7ce6743387a6055c99ed39dfa60495acce
@@@ -7857,26 -7868,21 +7870,41 @@@ static void do_versions(FileData *fd, L
                        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;
 +                              if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
 +                              if (ma->vol_part_maxnearest == 0) ma->vol_part_maxnearest = 5;
 +                              if (ma->vol_part_searchradius < 0.001f) ma->vol_part_searchradius = 0.20;
 +                      }
 +              }
        }
+       
+       /* set the curve radius interpolation to 2.47 default - easy */
+       if (main->versionfile < 247 || (main->versionfile == 247 && main->subversionfile < 6)) {
+               Curve *cu;
+               Nurb *nu;
+               
+               for(cu= main->curve.first; cu; cu= cu->id.next) {
+                       for(nu= cu->nurb.first; nu; nu= nu->next) {
+                               if (nu) {
+                                       nu->radius_interp = 3;
+                               }
+                       }
+               }
+       }
++
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
  
Simple merge