[Bf-blender-cvs] [a9e071d] soc-2016-multiview: Merge branch 'master' into soc-2016-multiview

Tianwei Shen noreply at git.blender.org
Fri Oct 21 10:40:10 CEST 2016


Commit: a9e071d12d1583ee746e542f0bc9633c393ce952
Author: Tianwei Shen
Date:   Fri Oct 21 16:39:57 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rBa9e071d12d1583ee746e542f0bc9633c393ce952

Merge branch 'master' into soc-2016-multiview

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 2053edd,14e02c9..7a65f1f
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1430,31 -1427,16 +1429,43 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
+ 		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ 			if (scene->toolsettings != NULL) {
+ 				ToolSettings *ts = scene->toolsettings;
+ 				ParticleEditSettings *pset = &ts->particle;
+ 				for (int a = 0; a < PE_TOT_BRUSH; a++) {
+ 					if (pset->brush[a].count == 0) {
+ 						pset->brush[a].count = 10;
+ 					}
+ 				}
+ 			}
+ 		}
++
 +		/* initialize regiondata for each SpaceClip, due to the newly brought RegionSpaceClip */
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceClip", "MovieClip", "*secondary_clip")) {
 +			for (bScreen *screen = main->screen.first; screen != NULL; screen = screen->id.next) {
 +				for (ScrArea *sa = screen->areabase.first; sa != NULL; sa = sa->next) {
 +					for (SpaceLink *sl = sa->spacedata.first; sl != NULL; sl = sl->next) {
 +						if (sl->spacetype == SPACE_CLIP) {
 +							ListBase *regionbase = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +							for (ARegion *ar = regionbase->first; ar != NULL; ar = ar->next) {
 +								if (ar->regiontype == RGN_TYPE_WINDOW) {
 +									SpaceClip *sc = (SpaceClip *)sl;
 +									RegionSpaceClip *rsc = MEM_callocN(sizeof(RegionSpaceClip), "region data for clip");
 +
 +									rsc->xof = sc->xof;
 +									rsc->yof = sc->yof;
 +									rsc->xlockof = sc->xlockof;
 +									rsc->ylockof = sc->ylockof;
 +									rsc->zoom = sc->zoom;
 +									rsc->flag = RSC_MAIN_CLIP;
 +									ar->regiondata = rsc;
 +								}
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
  }




More information about the Bf-blender-cvs mailing list