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

[Tianwei Shen]

Commit: 60a3e223c768511f7147de1fbf9ef2e29210fa4f
Author: Tianwei Shen
Date:   Mon Dec 19 01:00:35 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB60a3e223c768511f7147de1fbf9ef2e29210fa4f

Merge branch 'master' into soc-2016-multiview

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 7a65f1f,88c583b..829195e
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1441,31 -1442,54 +1444,81 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon", "float", "spring_stiffness_ang_x")) {
+ 			Object *ob;
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				RigidBodyCon *rbc = ob->rigidbody_constraint;
+ 				if (rbc) {
+ 					rbc->spring_stiffness_ang_x = 10.0;
+ 					rbc->spring_stiffness_ang_y = 10.0;
+ 					rbc->spring_stiffness_ang_z = 10.0;
+ 					rbc->spring_damping_ang_x = 0.5;
+ 					rbc->spring_damping_ang_y = 0.5;
+ 					rbc->spring_damping_ang_z = 0.5;
+ 				}
+ 			}
+ 		}
+ 
+ 		/* constant detail for sculpting is now a resolution value instead of
+ 		 * a percentage, we reuse old DNA struct member but convert it */
+ 		for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ 			if (scene->toolsettings != NULL) {
+ 				ToolSettings *ts = scene->toolsettings;
+ 				if (ts->sculpt && ts->sculpt->constant_detail != 0.0f) {
+ 					ts->sculpt->constant_detail = 100.0f / ts->sculpt->constant_detail;
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(main, 278, 4)) {
+ 		const float sqrt_3 = (float)M_SQRT3;
+ 		for (Brush *br = main->brush.first; br; br = br->id.next) {
+ 			br->fill_threshold /= sqrt_3;
+ 		}
+ 	}
+ 
+ 	/* To be added to next subversion bump! */
+ 	{
+ 		/* Mask primitive adding code was not initializing correctly id_type of its points' parent. */
+ 		for (Mask *mask = main->mask.first; mask; mask = mask->id.next) {
+ 			for (MaskLayer *mlayer = mask->masklayers.first; mlayer; mlayer = mlayer->next) {
+ 				for (MaskSpline *mspline = mlayer->splines.first; mspline; mspline = mspline->next) {
+ 					int i = 0;
+ 					for (MaskSplinePoint *mspoint = mspline->points; i < mspline->tot_point; mspoint++, i++) {
+ 						if (mspoint->parent.id_type == 0) {
+ 							BKE_mask_parent_init(&mspoint->parent);
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
++
 +		/* 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;
 +								}
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
  }