svn merge -r 16741:16866 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 1 Oct 2008 16:22:28 +0000 (16:22 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 1 Oct 2008 16:22:28 +0000 (16:22 +0000)
1  2 
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/texture.c
source/blender/src/buttons_shading.c

@@@ -7906,7 -7894,41 +7917,42 @@@ static void do_versions(FileData *fd, L
                        }
                }
        }
 +
+       /* direction constraint actuators were always local in previous version */
+       if (main->versionfile < 247 || (main->versionfile == 247 && main->subversionfile < 7)) {
+               bActuator *act;
+               Object *ob;
+               
+               for(ob = main->object.first; ob; ob= ob->id.next) {
+                       for(act= ob->actuators.first; act; act= act->next) {
+                               if (act->type == ACT_CONSTRAINT) {
+                                       bConstraintActuator *coa = act->data;
+                                       if (coa->type == ACT_CONST_TYPE_DIST) {
+                                               coa->flag |= ACT_CONST_LOCAL;
+                                       }
+                               }
+                       }
+               }
+       }
+       /* autokey mode settings now used from scene, but need to be initialised off userprefs */
+       if (main->versionfile < 247 || (main->versionfile == 247 && main->subversionfile < 8)) {
+               Scene *sce;
+               
+               for (sce= main->scene.first; sce; sce= sce->id.next) {
+                       if (sce->autokey_mode == 0)
+                               sce->autokey_mode= U.autokey_mode;
+               }
+       }
+       if (main->versionfile < 247 || (main->versionfile == 247 && main->subversionfile < 9)) {
+               Lamp *la= main->lamp.first;
+               for(; la; la= la->id.next) {
+                       la->sky_exposure= 1.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! */
  
Simple merge