[Bf-blender-cvs] [e3576c7] master: Correct previous commit, need to indent verisoning code

Sergey Sharybin noreply at git.blender.org
Tue Aug 16 13:54:03 CEST 2016


Commit: e3576c7bf45a6b5666df093b8194a3c5e4b67a2e
Author: Sergey Sharybin
Date:   Tue Aug 16 13:53:29 2016 +0200
Branches: master
https://developer.blender.org/rBe3576c7bf45a6b5666df093b8194a3c5e4b67a2e

Correct previous commit, need to indent verisoning code

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

M	source/blender/blenloader/intern/versioning_270.c

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

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 45c73ed..18b6088 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1339,39 +1339,39 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		/* ------- end of grease pencil initialization --------------- */
 	}
 
-	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)
+	{
+		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)
 				{
-					track->weight_stab = track->weight;
+					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) {
-					/* ensure init.
-					 * Was previously used for autoscale only,
-					 * now used always (as "target scale") */
-					clip->tracking.stabilization.scale = 1.0f;
+		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) {
+						/* ensure init.
+						 * Was previously used for autoscale only,
+						 * now used always (as "target scale") */
+						clip->tracking.stabilization.scale = 1.0f;
+					}
 				}
 			}
 		}




More information about the Bf-blender-cvs mailing list