[Bf-blender-cvs] [6bbdde1] temp_localview_split: Merge branch 'master' into temp_localview_split

Julian Eisel noreply at git.blender.org
Fri Oct 7 23:25:00 CEST 2016


Commit: 6bbdde1fd0fafbfbea621ee1a3e70b544a477e8b
Author: Julian Eisel
Date:   Fri Oct 7 23:11:28 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rB6bbdde1fd0fafbfbea621ee1a3e70b544a477e8b

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 ddd3b80,0d4ff00..e33b36e
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1431,30 -1393,36 +1432,62 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
+ 	if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "ffmpeg_preset")) {
+ 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 				/* "medium" is the preset FFmpeg uses when no presets are given. */
+ 				scene->r.ffcodecdata.ffmpeg_preset = FFM_PRESET_MEDIUM;
+ 			}
+ 		}
+ 		if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) {
+ 			for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 				/* fall back to behaviour from before we introduced CRF for old files */
+ 				scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE;
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "SmokeModifierData", "float", "slice_per_voxel")) {
+ 			Object *ob;
+ 			ModifierData *md;
+ 
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				for (md = ob->modifiers.first; md; md = md->next) {
+ 					if (md->type == eModifierType_Smoke) {
+ 						SmokeModifierData *smd = (SmokeModifierData *)md;
+ 						if (smd->domain) {
+ 							smd->domain->slice_per_voxel = 5.0f;
+ 							smd->domain->slice_depth = 0.5f;
+ 							smd->domain->display_thickness = 1.0f;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
 +
 +	{
 +		/* 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 */
 +			}
 +		}
 +	}
  }




More information about the Bf-blender-cvs mailing list