Merging r42533 through r42601 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2011 11:58:59 +0000 (11:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2011 11:58:59 +0000 (11:58 +0000)
1  2 
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c

index 6479c3ee04ddb8b42952777fcb03e1996d9af025,1ada2448d8614977a325793115c8380992d46457..340582ba6276e6423e2537fcd76d9af960f5760f
@@@ -12676,16 -12655,19 +12676,26 @@@ static void do_versions(FileData *fd, L
                }
        }
  
+       if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 8))
+       {
+               Brush *brush;
+               for (brush= main->brush.first; brush; brush= brush->id.next) {
+                       if (brush->sculpt_tool == SCULPT_TOOL_ROTATE)
+                               brush->alpha= 1.0f;
+               }
+       }
        /* put compatibility code here until next subversion bump */
        {
 -              /* nothing! */
 +              MovieClip *clip;
 +
 +              for (clip= main->movieclip.first; clip; clip= clip->id.next) {
 +                      MovieTracking *tracking= &clip->tracking;
 +
 +                      if(tracking->objects.first == NULL)
 +                              BKE_tracking_new_object(tracking, "Camera");
 +              }
        }
  
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */