svn merge -r 16454:16593 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 18 Sep 2008 14:59:44 +0000 (14:59 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 18 Sep 2008 14:59:44 +0000 (14:59 +0000)
1  2 
config/linux2-config.py
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_object.c
source/blender/src/editipo.c
source/blender/src/header_ipo.c

Simple merge
index e403a28141c4789448434ee232a2245a8e45e0c5,f3f1a99cdbff5dae200b7c77073557200dc8d9ae..928def7705926a5dbac520bf8bdc590b788be543
@@@ -7767,31 -7775,8 +7783,31 @@@ static void do_versions(FileData *fd, L
                        la->sun_intensity = 1.0;
                }
        }
 +      
 +      // convert fluids to modifier
 +      if(main->versionfile <= 246 && main->subversionfile < 1)
 +      {
 +              Object *ob;
 +              
 +              for(ob = main->object.first; ob; ob= ob->id.next) {
 +                      if(ob->fluidsimSettings)
 +                      {
 +                              FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifier_new(eModifierType_Fluidsim);
 +                              BLI_addhead(&ob->modifiers, (ModifierData *)fluidmd);
 +                              
 +                              MEM_freeN(fluidmd->fss);
 +                              fluidmd->fss = MEM_dupallocN(ob->fluidsimSettings);
 +                              fluidmd->fss->ipo = newlibadr_us(fd, ob->id.lib, ob->fluidsimSettings->ipo);
 +                              MEM_freeN(ob->fluidsimSettings);
 +                              
 +                              fluidmd->fss->lastgoodframe = INT_MAX;
 +                              fluidmd->fss->flag = 0;
 +                      }
 +              }
 +      }
 +      
  
-       if(main->versionfile <= 246 && main->subversionfile < 1){
+       if(main->versionfile < 246 || (main->versionfile == 246 && main->subversionfile < 1)) {
                Mesh *me;
  
                for(me=main->mesh.first; me; me= me->id.next)
Simple merge
index 221f9a1c7298fe9a7aa817c2a9d7fc6ac9e2aad0,09862636085934d00a1de1f213e142fada15ae3d..fc0ac71908b00cf56ad05fa084d1db6b93387ce2
@@@ -1895,15 -1883,14 +1911,15 @@@ Ipo *verify_ipo(ID *from, short blockty
                                        }
                                        return NULL;
                                }
-                               else if(blocktype== ID_FLUIDSIM) {
+                               else if (blocktype== ID_FLUIDSIM) {
                                        Object *ob= (Object *)from;
 -                                      
 -                                      if (ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) {
 -                                              FluidsimSettings *fss= ob->fluidsimSettings;
++
 +                                      FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(ob, eModifierType_Fluidsim);
 +                                      if(fluidmd) {
 +                                              FluidsimSettings *fss= fluidmd->fss;
-                                               if(fss->ipo==NULL) {
+                                               
+                                               if ((fss->ipo==NULL) && (add))
                                                        fss->ipo= add_ipo("FluidsimIpo", ID_FLUIDSIM);
-                                                       //fprintf(stderr,"FSIPO NEW!\n");
-                                               }
                                                return fss->ipo;
                                        }
                                }
Simple merge