[Bf-blender-cvs] [68f931fd90] HMD_viewport: Merge branch 'master' of git.blender.org:blender into HMD_viewport

[Joey Ferwerda]

Commit: 68f931fd905e6d9a7d46ede454340694b52052aa
Author: Joey Ferwerda
Date:   Fri Feb 10 16:50:30 2017 +0100
Branches: HMD_viewport
https://developer.blender.org/rB68f931fd905e6d9a7d46ede454340694b52052aa

Merge branch 'master' of git.blender.org:blender into HMD_viewport

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 190800480a,6235ebf28e..ea5f8fabcc
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1472,15 -1527,70 +1527,80 @@@ void blo_do_versions_270(FileData *fd, 
  		for (Brush *br = main->brush.first; br; br = br->id.next) {
  			br->fill_threshold /= sqrt_3;
  		}
+ 
+ 		/* Custom motion paths */
+ 		if (!DNA_struct_elem_find(fd->filesdna, "bMotionPath", "int", "line_thickness")) {
+ 			Object *ob;
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				bMotionPath *mpath;
+ 				bPoseChannel *pchan;
+ 				mpath = ob->mpath;
+ 				if (mpath) {
+ 					mpath->color[0] = 1.0f;
+ 					mpath->color[1] = 0.0f;
+ 					mpath->color[2] = 0.0f;
+ 					mpath->line_thickness = 1;
+ 					mpath->flag |= MOTIONPATH_FLAG_LINES;
+ 				}
+ 				/* bones motion path */
+ 				if (ob->pose) {
+ 					for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						mpath = pchan->mpath;
+ 						if (mpath) {
+ 							mpath->color[0] = 1.0f;
+ 							mpath->color[1] = 0.0f;
+ 							mpath->color[2] = 0.0f;
+ 							mpath->line_thickness = 1;
+ 							mpath->flag |= MOTIONPATH_FLAG_LINES;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	/* 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);
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 	}
+ }
+ 
+ void do_versions_after_linking_270(Main *main)
+ {
+ 	/* To be added to next subversion bump! */
+ 	{
+ 		FOREACH_NODETREE(main, ntree, id) {
+ 			if (ntree->type == NTREE_COMPOSIT) {
+ 				ntreeSetTypes(NULL, ntree);
+ 				for (bNode *node = ntree->nodes.first; node; node = node->next) {
+ 					if (node->type == CMP_NODE_HUE_SAT) {
+ 						do_version_hue_sat_node(ntree, node);
+ 					}
+ 				}
+ 			}
+ 		} FOREACH_NODETREE_END
  	}
 +
 +	{
 +#ifdef WITH_INPUT_HMD
 +		if (!DNA_struct_elem_find(fd->filesdna, "wmWindowManager", "HMDViewInfo", "hmd_view")) {
 +			for (wmWindowManager *wm = main->wm.first; wm; wm = wm->id.next) {
 +				wm->hmd_view.view_shade = OB_MATERIAL;
 +			}
 +		}
 +#endif
 +	}
  }