[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57061] trunk/blender/source/blender: fix error in own recent commit, also other minor changes.

[Campbell Barton]

Revision: 57061
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57061
Author:   campbellbarton
Date:     2013-05-27 18:51:31 +0000 (Mon, 27 May 2013)
Log Message:
-----------
fix error in own recent commit, also other minor changes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_rotation.c
    trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
    trunk/blender/source/blender/nodes/intern/node_common.c

Modified: trunk/blender/source/blender/blenlib/intern/math_rotation.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_rotation.c	2013-05-27 18:10:36 UTC (rev 57060)
+++ trunk/blender/source/blender/blenlib/intern/math_rotation.c	2013-05-27 18:51:31 UTC (rev 57061)
@@ -573,21 +573,15 @@
 {
 	float quat[4], omega, cosom, sinom, sc1, sc2;
 
-	cosom = quat1[0] * quat2[0] + quat1[1] * quat2[1] + quat1[2] * quat2[2] + quat1[3] * quat2[3];
+	cosom = dot_qtqt(quat1, quat2);
 
 	/* rotate around shortest angle */
 	if (cosom < 0.0f) {
 		cosom = -cosom;
-		quat[0] = -quat1[0];
-		quat[1] = -quat1[1];
-		quat[2] = -quat1[2];
-		quat[3] = -quat1[3];
+		negate_v4_v4(quat, quat1);
 	}
 	else {
-		quat[0] = quat1[0];
-		quat[1] = quat1[1];
-		quat[2] = quat1[2];
-		quat[3] = quat1[3];
+		copy_qt_qt(quat, quat1);
 	}
 
 	if ((1.0f - cosom) > 0.0001f) {
@@ -640,7 +634,7 @@
 		n[0] = 1.0f;
 	}
 
-	angle = -0.5f * (float)saacos(vec[2]);
+	angle = -0.5f * saacos(vec[2]);
 	co = cosf(angle);
 	si = sinf(angle);
 	q1[0] = co;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-05-27 18:10:36 UTC (rev 57060)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c	2013-05-27 18:51:31 UTC (rev 57061)
@@ -785,8 +785,9 @@
 			BMEditSelection *ese = (BMEditSelection *)em->bm->selected.last;
 
 			if (ese && ese->htype == BM_VERT) {
-				if (r_eve) *r_eve = (BMVert *)ese->ele;
-				*r_dvert = BM_ELEM_CD_GET_VOID_P(*r_eve, cd_dvert_offset);
+				BMVert *eve = (BMVert *)ese->ele;
+				if (r_eve) *r_eve = eve;
+				*r_dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
 				return;
 			}
 		}

Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c	2013-05-27 18:10:36 UTC (rev 57060)
+++ trunk/blender/source/blender/nodes/intern/node_common.c	2013-05-27 18:51:31 UTC (rev 57061)
@@ -270,8 +270,7 @@
 	node->done = 1;
 	
 	/* recursive update */
-	for (link = ntree->links.first; link; link = link->next)
-	{
+	for (link = ntree->links.first; link; link = link->next) {
 		bNode *fromnode = link->fromnode;
 		bNode *tonode = link->tonode;
 		if (!tonode || !fromnode)