[Bf-blender-cvs] [c572c16] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: c572c16ad751ceb8b5e398fafe24c4158c08c8ad
Author: Julian Eisel
Date:   Tue May 17 19:56:46 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBc572c16ad751ceb8b5e398fafe24c4158c08c8ad

Merge branch 'master' into wiggly-widgets

Conflicts:
	release/scripts/startup/bl_ui/properties_data_bone.py
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/include/ED_transform.h
	source/blender/editors/transform/transform.c
	source/blender/makesdna/DNA_armature_types.h

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 860d24d,d6e2f23..84a4f3d
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -4933,9 -4924,11 +4933,12 @@@ static void direct_link_pose(FileData *
  		pchan->bone = NULL;
  		pchan->parent = newdataadr(fd, pchan->parent);
  		pchan->child = newdataadr(fd, pchan->child);
 +		pchan->fmap = newdataadr(fd, pchan->fmap);
  		pchan->custom_tx = newdataadr(fd, pchan->custom_tx);
  		
+ 		pchan->bbone_prev = newdataadr(fd, pchan->bbone_prev);
+ 		pchan->bbone_next = newdataadr(fd, pchan->bbone_next);
+ 		
  		direct_link_constraints(fd, &pchan->constraints);
  		
  		pchan->prop = newdataadr(fd, pchan->prop);
diff --cc source/blender/blenloader/intern/versioning_270.c
index 57ee141,58542d0..3317cf7
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1152,42 -1163,31 +1163,70 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 277, 2)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "Bone", "float", "scaleIn")) {
+ 			for (bArmature *arm = main->armature.first; arm; arm = arm->id.next) {
+ 				do_version_bones_super_bbone(&arm->bonebase);
+ 			}
+ 		}
+ 		if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "scaleIn")) {
+ 			for (Object *ob = main->object.first; ob; ob = ob->id.next) {
+ 				if (ob->pose) {
+ 					for (bPoseChannel *pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						/* see do_version_bones_super_bbone()... */
+ 						pchan->scaleIn = 1.0f;
+ 						pchan->scaleOut = 1.0f;
+ 						
+ 						/* also make sure some legacy (unused for over a decade) flags are unset,
+ 						 * so that we can reuse them for stuff that matters now...
+ 						 * (i.e. POSE_IK_MAT, (unknown/unused x 4), POSE_HAS_IK)
+ 						 *
+ 						 * These seem to have been runtime flags used by the IK solver, but that stuff
+ 						 * should be able to be recalculated automatically anyway, so it should be fine.
+ 						 */
+ 						pchan->flag &= ~((1 << 3) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7) | (1 << 8));
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
++
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_NODE) {
 +							SpaceNode *snode = (SpaceNode *)sl;
 +							snode->backdrop_zoom = 1.0;
 +						}
 +						if (sl->spacetype == SPACE_SEQ) {
 +							SpaceSeq *sseq = (SpaceSeq *)sl;
 +							sseq->overdrop_zoom = 1.0;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_IPO) {
 +							SpaceIpo *sipo = (SpaceIpo *)sl;
 +							sipo->backdrop_zoom = 1.0f;
 +							sipo->backdrop_opacity = 0.7f;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/editors/transform/transform.c
index 39b9c3e,5c0c0bc..b554709
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@@ -5193,10 -5200,19 +5192,10 @@@ static void applyBoneSize(TransInfo *t
  {
  	TransData *td = t->data;
  	float size[3], mat[3][3];
 -	float ratio;
 +	float ratio = t->values[0];
  	int i;
- 	char str[MAX_INFO_LEN];
+ 	char str[UI_MAX_DRAW_STR];
 -	
 -	// TRANSFORM_FIX_ME MOVE TO MOUSE INPUT
 -	/* for manipulator, center handle, the scaling can't be done relative to center */
 -	if ((t->flag & T_USES_MANIPULATOR) && t->con.mode == 0) {
 -		ratio = 1.0f - ((t->mouse.imval[0] - mval[0]) + (t->mouse.imval[1] - mval[1])) / 100.0f;
 -	}
 -	else {
 -		ratio = t->values[0];
 -	}
 -	
 +
  	copy_v3_fl(size, ratio);
  	
  	snapGridIncrement(t, size);
diff --cc source/blender/makesdna/DNA_armature_types.h
index 1c1a531,cda6441..dd13f47
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@@ -206,7 -212,8 +213,8 @@@ typedef enum eBone_Flag 
  	BONE_UNSELECTABLE           = (1 << 21),  /* bone cannot be selected */
  	BONE_NO_LOCAL_LOCATION      = (1 << 22),  /* bone location is in armature space */
  	BONE_RELATIVE_PARENTING     = (1 << 23),  /* object child will use relative transform (like deform) */
- 	BONE_DRAW_FMAP_ONLY         = (1 << 24),  /* don't draw bone itself in pose mode, only its facemap */
 -	BONE_ADD_PARENT_END_ROLL    = (1 << 24)   /* it will add the parent end roll to the inroll */
 -	
++	BONE_ADD_PARENT_END_ROLL    = (1 << 24),   /* it will add the parent end roll to the inroll */
++	BONE_DRAW_FMAP_ONLY         = (1 << 25),  /* don't draw bone itself in pose mode, only its facemap */
  } eBone_Flag;
  
  #define MAXBONENAME 64