[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40740] trunk/blender/source/blender: remove some redundant checks and compiler warnings.

[Campbell Barton]

Revision: 40740
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40740
Author:   campbellbarton
Date:     2011-10-02 12:21:24 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
remove some redundant checks and compiler warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/python/mathutils/mathutils.c

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2011-10-02 08:46:46 UTC (rev 40739)
+++ trunk/blender/source/blender/editors/transform/transform.c	2011-10-02 12:21:24 UTC (rev 40740)
@@ -2611,8 +2611,8 @@
 			copy_v3_v3(center, td->center);
 		}
 		else if (t->flag & T_EDIT) {
-			
-			if(t->around==V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
+
+			if(t->settings->selectmode & SCE_SELECT_FACE) {
 				copy_v3_v3(center, td->center);
 			}
 			else {
@@ -2899,19 +2899,17 @@
 	float vec[3], totmat[3][3], smat[3][3];
 	float eul[3], fmat[3][3], quat[4];
 	float *center = t->center;
-	
+
 	/* local constraint shouldn't alter center */
 	if (around == V3D_LOCAL) {
 		if (t->flag & (T_OBJECT|T_POSE)) {
 			center = td->center;
 		}
-		else {
-			if(around==V3D_LOCAL && (t->settings->selectmode & SCE_SELECT_FACE)) {
-				center = td->center;
-			}
+		else if (t->settings->selectmode & SCE_SELECT_FACE) {
+			center = td->center;
 		}
 	}
-	
+
 	if (t->flag & T_POINTS) {
 		mul_m3_m3m3(totmat, mat, td->mtx);
 		mul_m3_m3m3(smat, td->smtx, totmat);

Modified: trunk/blender/source/blender/python/mathutils/mathutils.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils.c	2011-10-02 08:46:46 UTC (rev 40739)
+++ trunk/blender/source/blender/python/mathutils/mathutils.c	2011-10-02 12:21:24 UTC (rev 40740)
@@ -94,11 +94,12 @@
 #if 1 /* approx 6x speedup for mathutils types */
 	int size;
 
-	if(	(VectorObject_Check(value) && (size= ((VectorObject *)value)->size)) ||
-		(EulerObject_Check(value) && (size= 3)) ||
-		(QuaternionObject_Check(value) && (size= 4)) ||
-		(ColorObject_Check(value) && (size= 3))
-	) {
+	if(     (size= VectorObject_Check(value)     ? ((VectorObject *)value)->size : 0) ||
+	        (size= EulerObject_Check(value)      ? 3 : 0) ||
+	        (size= QuaternionObject_Check(value) ? 4 : 0) ||
+	        (size= ColorObject_Check(value)      ? 3 : 0))
+	{
+		printf("siez %d\n", size);
 		if(BaseMath_ReadCallback((BaseMathObject *)value) == -1) {
 			return -1;
 		}