svn merge -r 17502:18705 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 28 Jan 2009 00:43:46 +0000 (00:43 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 28 Jan 2009 00:43:46 +0000 (00:43 +0000)
1  2 
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/effect.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/render/intern/source/occlusion.c
source/blender/render/intern/source/shadeinput.c

Simple merge
@@@ -8072,27 -8008,18 +8074,38 @@@ static void do_versions(FileData *fd, L
                        }
                }
        }
 -      
 +
 +      if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 3)) {
 +              Tex *tex;
 +              Material *ma;
 +              
 +              /* blend texture extrapolation */
 +              for(tex=main->tex.first; tex; tex= tex->id.next) {
 +                      if (tex->type == TEX_BLEND)
 +                              tex->extend = TEX_EXTEND;
 +              }
 +              
 +              for(ma=main->mat.first; ma; ma= ma->id.next) {
 +                      if (ma->vol_shadeflag & 2) { // old MA_VOL_ATTENUATED
 +                              ma->vol_shade_type = MA_VOL_SHADE_SINGLE;
 +                              ma->vol_ms_diff = 0.5f;
 +                              ma->vol_ms_steps = 5;
 +                              ma->vol_ms_intensity = 1.0;
 +                      }
 +              }
 +      }
 +
+       if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 2)) {
+               Scene *sce;
+               
+               /* Note, these will need to be added for painting */
+               for (sce= main->scene.first; sce; sce= sce->id.next) {
+                       sce->toolsettings->imapaint.seam_bleed = 2;
+                       sce->toolsettings->imapaint.normal_angle = 80;
+               }
+       }
+       
+       
        /* 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