[Bf-blender-cvs] [9d45015] temp_localview_split: Merge branch 'master' into temp_localview_split

[Julian Eisel]

Commit: 9d4501512aa2627d82b9cf6e2b139d0eadf9974b
Author: Julian Eisel
Date:   Thu Sep 8 13:17:07 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rB9d4501512aa2627d82b9cf6e2b139d0eadf9974b

Merge branch 'master' into temp_localview_split

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_270.c
index f0f3427,dfaa59c..ddd3b80
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1360,29 -1348,48 +1387,74 @@@ void blo_do_versions_270(FileData *fd, 
  		/* ------- end of grease pencil initialization --------------- */
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 278, 0)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingTrack", "float", "weight_stab")) {
+ 			MovieClip *clip;
+ 			for (clip = main->movieclip.first; clip; clip = clip->id.next) {
+ 				MovieTracking *tracking = &clip->tracking;
+ 				MovieTrackingObject *tracking_object;
+ 				for (tracking_object = tracking->objects.first;
+ 				     tracking_object != NULL;
+ 				     tracking_object = tracking_object->next)
+ 				{
+ 					ListBase *tracksbase = BKE_tracking_object_get_tracks(tracking, tracking_object);
+ 					MovieTrackingTrack *track;
+ 					for (track = tracksbase->first;
+ 					     track != NULL;
+ 					     track = track->next)
+ 					{
+ 						track->weight_stab = track->weight;
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "MovieTrackingStabilization", "int", "tot_rot_track")) {
+ 			MovieClip *clip;
+ 			for (clip = main->movieclip.first; clip != NULL; clip = clip->id.next) {
+ 				if (clip->tracking.stabilization.rot_track) {
+ 					migrate_single_rot_stabilization_track_settings(&clip->tracking.stabilization);
+ 				}
+ 				if (clip->tracking.stabilization.scale == 0.0f) {
+ 					/* ensure init.
+ 					 * Was previously used for autoscale only,
+ 					 * now used always (as "target scale") */
+ 					clip->tracking.stabilization.scale = 1.0f;
+ 				}
+ 				/* blender prefers 1-based frame counting;
+ 				 * thus using frame 1 as reference typically works best */
+ 				clip->tracking.stabilization.anchor_frame = 1;
+ 				/* by default show the track lists expanded, to improve "discoverability" */
+ 				clip->tracking.stabilization.flag |= TRACKING_SHOW_STAB_TRACKS;
+ 				/* deprecated, not used anymore */
+ 				clip->tracking.stabilization.ok = false;
+ 			}
+ 		}
+ 	}
++
 +	{
 +		/* New local view storage */
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3D", "LocalViewAreaData", "localviewd")) {
 +			/* update area/region data */
 +			for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 +				for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +					for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_VIEW3D) {
 +							ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +							do_version_localview_areadata((View3D *)sl);
 +							for (ARegion *ar = lb->first; ar; ar = ar->next) {
 +								if (ar->regiontype == RGN_TYPE_WINDOW) {
 +									do_version_localview_regiondata(ar->regiondata);
 +								}
 +							}
 +						}
 +					}
 +				}
 +			}
 +			/* update object data */
 +			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
 +				ob->localview.viewbits = (ob->lay >> 24); /* old local view used last byte of ob->lay */
 +			}
 +		}
 +	}
  }