[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49124] trunk/blender: code cleanup: replace cos(M_PI / 4) and sin(M_PI / 4) with M_SQRT1_2 define

[Campbell Barton]

Revision: 49124
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49124
Author:   campbellbarton
Date:     2012-07-22 18:40:50 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
code cleanup: replace cos(M_PI / 4) and sin(M_PI / 4) with M_SQRT1_2 define

also some minor style cleanup.

Modified Paths:
--------------
    trunk/blender/intern/itasc/Armature.cpp
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c
    trunk/blender/source/blender/python/generic/bpy_internal_import.c

Modified: trunk/blender/intern/itasc/Armature.cpp
===================================================================
--- trunk/blender/intern/itasc/Armature.cpp	2012-07-22 18:31:08 UTC (rev 49123)
+++ trunk/blender/intern/itasc/Armature.cpp	2012-07-22 18:40:50 UTC (rev 49124)
@@ -319,7 +319,7 @@
 			return iConstraint;
 		}
 	}
-	if (m_finalized)  {
+	if (m_finalized) {
 		if (_freeParam && _param)
 			free(_param);
 		return -1;

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-07-22 18:31:08 UTC (rev 49123)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-07-22 18:40:50 UTC (rev 49124)
@@ -1688,16 +1688,16 @@
 
 		if (cu->flag & CU_FOLLOW) {
 #if 0
-			float x1, q[4];
+			float si, q[4];
 			vec_to_quat(quat, dir, ob->trackflag, ob->upflag);
 			
 			/* the tilt */
 			normalize_v3(dir);
 			q[0] = (float)cos(0.5 * vec[3]);
-			x1 = (float)sin(0.5 * vec[3]);
-			q[1] = -x1 * dir[0];
-			q[2] = -x1 * dir[1];
-			q[3] = -x1 * dir[2];
+			si = (float)sin(0.5 * vec[3]);
+			q[1] = -si * dir[0];
+			q[2] = -si * dir[1];
+			q[3] = -si * dir[2];
 			mul_qt_qtqt(quat, q, quat);
 #else
 			quat_apply_track(quat, ob->trackflag, ob->upflag);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-07-22 18:31:08 UTC (rev 49123)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-07-22 18:40:50 UTC (rev 49124)
@@ -2873,7 +2873,7 @@
 			break;
 
 		case RV3D_VIEW_BACK:
-			axis_set_view(C, v3d, ar, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0),
+			axis_set_view(C, v3d, ar, 0.0, 0.0, -M_SQRT1_2, -M_SQRT1_2,
 			              viewnum, nextperspo, align_active);
 			break;
 
@@ -2888,7 +2888,7 @@
 			break;
 
 		case RV3D_VIEW_FRONT:
-			axis_set_view(C, v3d, ar, cosf(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0,
+			axis_set_view(C, v3d, ar, M_SQRT1_2, -M_SQRT1_2, 0.0, 0.0,
 			              viewnum, nextperspo, align_active);
 			break;
 

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2012-07-22 18:31:08 UTC (rev 49123)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2012-07-22 18:40:50 UTC (rev 49124)
@@ -1125,7 +1125,7 @@
 			break;
 
 		case RV3D_VIEW_BACK:
-			QUATSET(rv3d->viewquat, 0.0, 0.0, -cosf(M_PI / 4.0), -cosf(M_PI / 4.0));
+			QUATSET(rv3d->viewquat, 0.0, 0.0, -M_SQRT1_2, -M_SQRT1_2);
 			break;
 
 		case RV3D_VIEW_LEFT:
@@ -1137,7 +1137,7 @@
 			break;
 
 		case RV3D_VIEW_FRONT:
-			QUATSET(rv3d->viewquat, (float)cos(M_PI / 4.0), -sinf(M_PI / 4.0), 0.0, 0.0);
+			QUATSET(rv3d->viewquat, M_SQRT1_2, -M_SQRT1_2, 0.0, 0.0);
 			break;
 
 		case RV3D_VIEW_RIGHT:

Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c	2012-07-22 18:31:08 UTC (rev 49123)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c	2012-07-22 18:40:50 UTC (rev 49124)
@@ -157,7 +157,8 @@
 	}
 
 	/* we know this cant be importable, the name is too long for blender! */
-	if (namelen >= (MAX_ID_NAME - 2) - 3) return NULL;
+	if (namelen >= (MAX_ID_NAME - 2) - 3)
+		return NULL;
 
 	memcpy(txtname, name, namelen);
 	memcpy(&txtname[namelen], ".py", 4);