[Bf-blender-cvs] [b73aed1] soc-2016-cycles_denoising: Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

Lukas Stockner noreply at git.blender.org
Sun Aug 21 06:18:27 CEST 2016


Commit: b73aed1319f25e95e174222ebd9e7fa7b1d2d069
Author: Lukas Stockner
Date:   Sun Aug 21 06:07:37 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBb73aed1319f25e95e174222ebd9e7fa7b1d2d069

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 871c2e2,f6ac42c..437fab7
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1320,22 -1341,42 +1341,59 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  		/* ------- end of grease pencil initialization --------------- */
  	}
 +	
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "SceneRenderLayer", "int", "denoiseflag")) {
 +			Scene *sce;
 +
 +			for (sce = main->scene.first; sce; sce = sce->id.next) {
 +				SceneRenderLayer *rl;
 +				for (rl = sce->r.layers.first; rl; rl = rl->next) {
 +					rl->denoiseflag = SCE_DENOISE_DIFFDIR|SCE_DENOISE_GLOSSDIR|SCE_DENOISE_TRANSDIR|SCE_DENOISE_SUBDIR|
 +					                  SCE_DENOISE_DIFFIND|SCE_DENOISE_GLOSSIND|SCE_DENOISE_TRANSIND|SCE_DENOISE_SUBIND;
 +					rl->denoise_half_window = 8;
 +					rl->denoise_strength = 0.0f;
 +				}
 +			}
 +		}
 +	}
 +
  
+ 	{
+ 		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) {
+ 						/* 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