[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41336] branches/bmesh/blender: svn merge -r41329:41335 ^/trunk/blender

Campbell Barton ideasman42 at gmail.com
Fri Oct 28 14:57:37 CEST 2011


Revision: 41336
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41336
Author:   campbellbarton
Date:     2011-10-28 12:57:37 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
svn merge -r41329:41335 ^/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41329

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/key.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_rotation.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
    branches/bmesh/blender/source/blender/editors/armature/poseUtils.c
    branches/bmesh/blender/source/blender/editors/armature/poseobject.c
    branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
    branches/bmesh/blender/source/blender/editors/transform/transform.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
    branches/bmesh/blender/source/blender/python/intern/gpu.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
    branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-41329
   + /trunk/blender:39992-41335


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-41329
   + /trunk/blender/release:31524-41335

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/action.c	2011-10-28 12:40:15 UTC (rev 41335)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/action.c	2011-10-28 12:57:37 UTC (rev 41336)
@@ -647,12 +647,12 @@
 {
 	bConstraint *pcon, *con;
 	
-	VECCOPY(pchan->loc, chan->loc);
-	VECCOPY(pchan->size, chan->size);
-	VECCOPY(pchan->eul, chan->eul);
-	VECCOPY(pchan->rotAxis, chan->rotAxis);
+	copy_v3_v3(pchan->loc, chan->loc);
+	copy_v3_v3(pchan->size, chan->size);
+	copy_v3_v3(pchan->eul, chan->eul);
+	copy_v3_v3(pchan->rotAxis, chan->rotAxis);
 	pchan->rotAngle= chan->rotAngle;
-	QUATCOPY(pchan->quat, chan->quat);
+	copy_qt_qt(pchan->quat, chan->quat);
 	pchan->rotmode= chan->rotmode;
 	copy_m4_m4(pchan->chan_mat, (float(*)[4])chan->chan_mat);
 	copy_m4_m4(pchan->pose_mat, (float(*)[4])chan->pose_mat);
@@ -681,9 +681,9 @@
 
 	/* ik (dof) settings */
 	pchan->ikflag = pchan_from->ikflag;
-	VECCOPY(pchan->limitmin, pchan_from->limitmin);
-	VECCOPY(pchan->limitmax, pchan_from->limitmax);
-	VECCOPY(pchan->stiffness, pchan_from->stiffness);
+	copy_v3_v3(pchan->limitmin, pchan_from->limitmin);
+	copy_v3_v3(pchan->limitmax, pchan_from->limitmax);
+	copy_v3_v3(pchan->stiffness, pchan_from->stiffness);
 	pchan->ikstretch= pchan_from->ikstretch;
 	pchan->ikrotweight= pchan_from->ikrotweight;
 	pchan->iklinweight= pchan_from->iklinweight;
@@ -1118,13 +1118,13 @@
 			copy_m4_m4(pchanto->chan_mat, pchanfrom->chan_mat);
 			
 			/* used for local constraints */
-			VECCOPY(pchanto->loc, pchanfrom->loc);
-			QUATCOPY(pchanto->quat, pchanfrom->quat);
-			VECCOPY(pchanto->eul, pchanfrom->eul);
-			VECCOPY(pchanto->size, pchanfrom->size);
+			copy_v3_v3(pchanto->loc, pchanfrom->loc);
+			copy_qt_qt(pchanto->quat, pchanfrom->quat);
+			copy_v3_v3(pchanto->eul, pchanfrom->eul);
+			copy_v3_v3(pchanto->size, pchanfrom->size);
 			
-			VECCOPY(pchanto->pose_head, pchanfrom->pose_head);
-			VECCOPY(pchanto->pose_tail, pchanfrom->pose_tail);
+			copy_v3_v3(pchanto->pose_head, pchanfrom->pose_head);
+			copy_v3_v3(pchanto->pose_tail, pchanfrom->pose_tail);
 			
 			pchanto->rotmode= pchanfrom->rotmode;
 			pchanto->flag= pchanfrom->flag;

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/anim.c	2011-10-28 12:40:15 UTC (rev 41335)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/anim.c	2011-10-28 12:57:37 UTC (rev 41336)
@@ -364,10 +364,10 @@
 		if (mpt->pchan) {
 			/* heads or tails */
 			if (mpath->flag & MOTIONPATH_FLAG_BHEAD) {
-				VECCOPY(mpv->co, mpt->pchan->pose_head);
+				copy_v3_v3(mpv->co, mpt->pchan->pose_head);
 			}
 			else {
-				VECCOPY(mpv->co, mpt->pchan->pose_tail);
+				copy_v3_v3(mpv->co, mpt->pchan->pose_tail);
 			}
 			
 			/* result must be in worldspace */
@@ -375,7 +375,7 @@
 		}
 		else {
 			/* worldspace object location */
-			VECCOPY(mpv->co, mpt->ob->obmat[3]);
+			copy_v3_v3(mpv->co, mpt->ob->obmat[3]);
 		}
 	}
 }
@@ -655,15 +655,15 @@
 
 		totfac= data[0]+data[3];
 		if(totfac>FLT_EPSILON)	interp_qt_qtqt(q1, p0->quat, p3->quat, data[3] / totfac);
-		else					QUATCOPY(q1, p1->quat);
+		else					copy_qt_qt(q1, p1->quat);
 
 		totfac= data[1]+data[2];
 		if(totfac>FLT_EPSILON)	interp_qt_qtqt(q2, p1->quat, p2->quat, data[2] / totfac);
-		else					QUATCOPY(q2, p3->quat);
+		else					copy_qt_qt(q2, p3->quat);
 
 		totfac = data[0]+data[1]+data[2]+data[3];
 		if(totfac>FLT_EPSILON)	interp_qt_qtqt(quat, q1, q2, (data[1]+data[2]) / totfac);
-		else					QUATCOPY(quat, q2);
+		else					copy_qt_qt(quat, q2);
 	}
 
 	if(radius)
@@ -843,7 +843,7 @@
 	add_v3_v3(vec, vdd->obmat[3]);
 	
 	copy_m4_m4(obmat, vdd->obmat);
-	VECCOPY(obmat[3], vec);
+	copy_v3_v3(obmat[3], vec);
 	
 	if(vdd->par->transflag & OB_DUPLIROT) {
 		if(no_f) {
@@ -868,7 +868,7 @@
 	vdd->ob->lay = origlay;
 
 	if(vdd->orco)
-		VECCOPY(dob->orco, vdd->orco[index]);
+		copy_v3_v3(dob->orco, vdd->orco[index]);
 	
 	if(vdd->ob->transflag & OB_DUPLI) {
 		float tmpmat[4][4];
@@ -1116,7 +1116,7 @@
 						
 						copy_m4_m4(obmat, ob__obmat);
 						
-						VECCOPY(obmat[3], cent);
+						copy_v3_v3(obmat[3], cent);
 						
 						/* rotation */
 						tri_to_quat( quat,v1, v2, v3);
@@ -1375,7 +1375,7 @@
 					psys_get_dupli_path_transform(&sim, NULL, cpa, cache, pamat, &scale);
 				}
 
-				VECCOPY(pamat[3], cache->co);
+				copy_v3_v3(pamat[3], cache->co);
 				pamat[3][3]= 1.0f;
 				
 			}
@@ -1423,7 +1423,7 @@
 				/* to give ipos in object correct offset */
 				where_is_object_time(scene, ob, ctime-pa_time);
 
-				VECCOPY(vec, obmat[3]);
+				copy_v3_v3(vec, obmat[3]);
 				obmat[3][0] = obmat[3][1] = obmat[3][2] = 0.0f;
 
 				/* particle rotation uses x-axis as the aligned axis, so pre-rotate the object accordingly */
@@ -1543,7 +1543,7 @@
 			mul_m4_v3(pmat, vec);
 			
 			copy_m4_m4(obmat, par->obmat);
-			VECCOPY(obmat[3], vec);
+			copy_v3_v3(obmat[3], vec);
 			
 			new_dupli_object(lb, ob, obmat, par->lay, a, OB_DUPLIVERTS, animated);
 		}

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c	2011-10-28 12:40:15 UTC (rev 41335)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c	2011-10-28 12:57:37 UTC (rev 41336)
@@ -390,11 +390,11 @@
 	
 	pdist[0]= 0.0f;
 	for(a=0, fp= data; a<MAX_BBONE_SUBDIV; a++, fp+=4) {
-		QUATCOPY(temp[a], fp);
+		copy_qt_qt(temp[a], fp);
 		pdist[a+1]= pdist[a]+len_v3v3(fp, fp+4);
 	}
 	/* do last point */
-	QUATCOPY(temp[a], fp);
+	copy_qt_qt(temp[a], fp);
 	totdist= pdist[a];
 	
 	/* go over distances and calculate new points */
@@ -420,7 +420,7 @@
 		fp[3]= fac1*temp[nr-1][3]+ fac2*temp[nr][3];
 	}
 	/* set last point, needed for orientation calculus */
-	QUATCOPY(fp, temp[MAX_BBONE_SUBDIV]);
+	copy_qt_qt(fp, temp[MAX_BBONE_SUBDIV]);
 }
 
 /* returns pointer to static array, filled with desired amount of bone->segments elements */
@@ -488,9 +488,9 @@
 
 		/* transform previous point inside this bone space */
 		if(rest)
-			VECCOPY(h1, prev->bone->arm_head)
+			copy_v3_v3(h1, prev->bone->arm_head);
 		else
-			VECCOPY(h1, prev->pose_head)
+			copy_v3_v3(h1, prev->pose_head);
 		mul_m4_v3(imat, h1);
 
 		if(prev->bone->segments>1) {
@@ -527,9 +527,9 @@
 		
 		/* transform next point inside this bone space */
 		if(rest)
-			VECCOPY(h2, next->bone->arm_tail)
+			copy_v3_v3(h2, next->bone->arm_tail);
 		else
-			VECCOPY(h2, next->pose_tail)
+			copy_v3_v3(h2, next->pose_tail);
 		mul_m4_v3(imat, h2);
 		/* if next bone is B-bone too, use average handle direction */
 		if(next->bone->segments>1);
@@ -575,7 +575,7 @@
 		vec_roll_to_mat3(h1, fp[3], mat3);		// fp[3] is roll
 
 		copy_m4_m3(result_array[a].mat, mat3);
-		VECCOPY(result_array[a].mat[3], fp);
+		copy_v3_v3(result_array[a].mat[3], fp);
 
 		if(doscale) {
 			/* correct for scaling when this matrix is used in scaled space */
@@ -737,7 +737,7 @@
 
 	if(bone==NULL) return 0.0f;
 	
-	VECCOPY (cop, co);
+	copy_v3_v3(cop, co);
 
 	fac= distfactor_to_bone(cop, bone->arm_head, bone->arm_tail, bone->rad_head, bone->rad_tail, bone->dist);
 	
@@ -782,7 +782,7 @@
 	if (!weight)
 		return;
 
-	VECCOPY(cop, co);
+	copy_v3_v3(cop, co);
 
 	if(vec) {
 		if(pchan->bone->segments>1)
@@ -1019,7 +1019,7 @@
 				normalize_dq(dq, contrib);
 
 				if(armature_weight != 1.0f) {
-					VECCOPY(dco, co);
+					copy_v3_v3(dco, co);
 					mul_v3m3_dq( dco, (defMats)? summat: NULL,dq);
 					sub_v3_v3(dco, co);
 					mul_v3_fl(dco, armature_weight);
@@ -1115,11 +1115,11 @@
 	float nLocMat[4][4];
 	
 	/* build matrix for location */
-	VECCOPY(xLocMat[3], inloc);
+	copy_v3_v3(xLocMat[3], inloc);
 
 	/* get bone-space cursor matrix and extract location */
 	armature_mat_world_to_pose(ob, xLocMat, nLocMat);
-	VECCOPY(outloc, nLocMat[3]);
+	copy_v3_v3(outloc, nLocMat[3]);
 }
 
 /* Convert Pose-Space Matrix to Bone-Space Matrix 
@@ -1194,11 +1194,11 @@
 	float nLocMat[4][4];
 	
 	/* build matrix for location */
-	VECCOPY(xLocMat[3], inloc);
+	copy_v3_v3(xLocMat[3], inloc);
 
 	/* get bone-space cursor matrix and extract location */
 	armature_mat_pose_to_bone(pchan, xLocMat, nLocMat);
-	VECCOPY(outloc, nLocMat[3]);
+	copy_v3_v3(outloc, nLocMat[3]);
 }
 
 /* same as object_mat3_to_rot() */
@@ -1403,7 +1403,7 @@
 		copy_m4_m3(offs_bone, bone->bone_mat);
 				
 		/* The bone's root offset (is in the parent's coordinate system) */
-		VECCOPY(offs_bone[3], bone->head);
+		copy_v3_v3(offs_bone[3], bone->head);
 
 		/* Get the length translation of parent (length along y axis) */
 		offs_bone[3][1]+= prevbone->length;
@@ -1413,7 +1413,7 @@
 	}
 	else {
 		copy_m4_m3(bone->arm_mat, bone->bone_mat);
-		VECCOPY(bone->arm_mat[3], bone->head);
+		copy_v3_v3(bone->arm_mat[3], bone->head);
 	}
 	
 	/* and the kiddies */
@@ -1849,8 +1849,8 @@
 	/* firstly, calculate the bone matrix the standard way, since this is needed for roll control */
 	where_is_pose_bone(scene, ob, pchan, ctime, 1);
 	
-	VECCOPY(poseHead, pchan->pose_head);
-	VECCOPY(poseTail, pchan->pose_tail);
+	copy_v3_v3(poseHead, pchan->pose_head);
+	copy_v3_v3(poseTail, pchan->pose_tail);
 	
 	/* step 1: determine the positions for the endpoints of the bone */
 	{
@@ -1894,7 +1894,7 @@
 			
 			/* store the position, and convert it to pose space */
 			mul_m4_v3(ob->imat, vec);
-			VECCOPY(poseHead, vec);
+			copy_v3_v3(poseHead, vec);
 			
 			/* set the new radius (it should be the average value) */
 			radius = (radius+rad) / 2;
@@ -1918,9 +1918,9 @@
 		/* compute the raw rotation matrix from the bone's current matrix by extracting only the
 		 * orientation-relevant axes, and normalising them
 		 */
-		VECCOPY(rmat[0], pchan->pose_mat[0]);
-		VECCOPY(rmat[1], pchan->pose_mat[1]);
-		VECCOPY(rmat[2], pchan->pose_mat[2]);
+		copy_v3_v3(rmat[0], pchan->pose_mat[0]);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list