Merging r41037 through r41092 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 17 Oct 2011 15:55:35 +0000 (15:55 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 17 Oct 2011 15:55:35 +0000 (15:55 +0000)
1  2 
CMakeLists.txt
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/startup/bl_ui/properties_object_constraint.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/constraint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c

diff --cc CMakeLists.txt
Simple merge
@@@ -12317,60 -12177,19 +12317,74 @@@ static void do_versions(FileData *fd, L
                                do_versions_nodetree_image_default_alpha_output(ntree);
                }
  
+               {
+                       /* support old particle dupliobject rotation settings */
+                       ParticleSettings *part;
+                       for (part=main->particle.first; part; part=part->id.next) {
+                               if(ELEM(part->ren_as, PART_DRAW_OB, PART_DRAW_GR)) {
+                                       part->draw |= PART_DRAW_ROTATE_OB;
+                                       if(part->rotmode == 0)
+                                               part->rotmode = PART_ROT_VEL;
+                               }
+                       }
+               }
++
 +              {
 +                      bScreen *sc;
 +                      Camera *cam;
 +                      MovieClip *clip;
 +
 +                      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 *sc= (SpaceClip *)sl;
 +                                                      if(sc->scopes.track_preview_height==0)
 +                                                              sc->scopes.track_preview_height= 120;
 +                                              }
 +                                      }
 +                              }
 +
 +                      }
 +
 +                      for(cam= main->camera.first; cam; cam= cam->id.next) {
 +                              if (cam->sensor_x < 0.01) {
 +                                      cam->sensor_x = 32.f;
 +                              }
 +                      }
 +
 +                      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;
 +                      }
 +              }
        }
  
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */