Merging trunk into soc-2011-tomato up to revision 40540
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 25 Sep 2011 20:03:03 +0000 (20:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 25 Sep 2011 20:03:03 +0000 (20:03 +0000)
16 files changed:
1  2 
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/imbuf/intern/indexer.c
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/envmap.c
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

diff --cc CMakeLists.txt
Simple merge
index 5f8e96e9a469b1e07bd59029fcc28f6a4f60dd4c,6163fa015a8d76f96e9b1360d8d9244b8d0b971d..eb64fa13bcbc3074c084dd3d56ef5e09ec23c806
@@@ -12176,58 -12066,14 +12176,67 @@@ static void do_versions(FileData *fd, L
        /* put compatibility code here until next subversion bump */
  
        {
 +              bScreen *sc;
 +              Camera *cam;
 +              MovieClip *clip;
 +
+               {
+                       /* Adaptive time step for particle systems */
+                       ParticleSettings *part;
+                       for (part = main->particle.first; part; part = part->id.next) {
+                               part->courant_target = 0.2f;
+                               part->time_flag &= ~PART_TIME_AUTOSF;
+                       }
+               }
++
 +              for (sc= main->screen.first; sc; sc= sc->id.next) {
 +                      ScrArea *sa;
 +                      for (sa= sc->areabase.first; sa; sa= sa->next) {
 +                              SpaceLink *sl;
 +                              for (sl= sa->spacedata.first; sl; sl= sl->next) {
 +                                      if(sl->spacetype==SPACE_VIEW3D) {
 +                                              View3D *v3d= (View3D *)sl;
 +
 +                                              if(v3d->bundle_size==0.0f) {
 +                                                      v3d->bundle_size= 0.1f;
 +                                                      v3d->flag2 |= V3D_SHOW_RECONSTRUCTION;
 +                                              }
 +
 +                                              if(v3d->bundle_drawtype==0)
 +                                                      v3d->bundle_drawtype= OB_EMPTY_SPHERE;
 +                                      }
 +                                      else if(sl->spacetype==SPACE_CLIP) {
 +                                              SpaceClip *sclip= (SpaceClip *)sl;
 +                                              if(sclip->scopes.track_preview_height==0)
 +                                                      sclip->scopes.track_preview_height= 120;
 +                                      }
 +                              }
 +                      }
 +              }
 +
 +              for (clip= main->movieclip.first; clip; clip= clip->id.next) {
 +                      if(clip->aspx<1.0f) {
 +                              clip->aspx= 1.0f;
 +                              clip->aspy= 1.0f;
 +                      }
 +
 +                      /* XXX: a bit hacky, probably include imbuf and use real constants are nicer */
 +                      clip->proxy.build_tc_flag= 7;
 +                      if(clip->proxy.build_size_flag==0)
 +                              clip->proxy.build_size_flag= 1;
 +
 +                      if(clip->proxy.quality==0)
 +                              clip->proxy.quality= 90;
 +
 +                      if(clip->tracking.camera.pixel_aspect<0.01f)
 +                              clip->tracking.camera.pixel_aspect= 1.f;
 +              }
 +
 +              for(cam= main->camera.first; cam; cam= cam->id.next) {
 +                      if (cam->sensor_x < 0.01f) {
 +                              cam->sensor_x = 32.f;
 +                      }
 +              }
        }
  
        //set defaults for obstacle avoidance, recast data
Simple merge
Simple merge
Simple merge