[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42148] branches/bmesh/blender/source/ blender: replace unhelpfully named `eck!` and `eek!` error prints, also some minor changes to math library use.

[Campbell Barton]

Revision: 42148
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42148
Author:   campbellbarton
Date:     2011-11-24 23:09:55 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
replace unhelpfully named `eck!` and `eek!` error prints, also some minor changes to math library use.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
    branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
    branches/bmesh/blender/source/blender/bmesh/operators/connectops.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-11-24 22:40:43 UTC (rev 42147)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-11-24 23:09:55 UTC (rev 42148)
@@ -386,7 +386,9 @@
 			}
 			
 			if (!kb) {
-				printf("error in DM_to_mesh: could not find active shapekey! eek!!\n");
+				printf("%s: error - could not find active shapekey %d!\n",
+				       __func__, ob->shapenr-1);
+
 				i = INT_MAX;
 			}
 		} else {

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2011-11-24 22:40:43 UTC (rev 42147)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c	2011-11-24 23:09:55 UTC (rev 42148)
@@ -305,7 +305,7 @@
 			   adjust the dot product if one but not both loops 
 			   actually runs from from e->v2 to e->v1 */
 			if ((l->prev->e->v1 == l->prev->v) ^ (l->e->v1 == l->v)) {
-				dotprod *= -1.0f;
+				dotprod= -dotprod;
 			}
 
 			fac = saacos(-dotprod);
@@ -321,8 +321,7 @@
 			continue;
 
 		if (normalize_v3(v->no) == 0.0f) {
-			copy_v3_v3(v->no, v->co);
-			normalize_v3(v->no);
+			normalize_v3_v3(v->no, v->co);
 		}
 	}
 	
@@ -395,7 +394,7 @@
 				MDisps *lmd = CustomData_bmesh_get(&bm->ldata, l->head.data, CD_MDISPS);
 				
 				if (!lmd->disps) {
-					printf("eck!\n");
+					printf("%s: warning - 'lmd->disps' == NULL\n", __func__);
 				}
 				
 				if (lmd->disps && lmd->totdisp == mdisps->totdisp) {

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2011-11-24 22:40:43 UTC (rev 42147)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c	2011-11-24 23:09:55 UTC (rev 42148)
@@ -512,7 +512,7 @@
 void BM_flip_normal(BMesh *bm, BMFace *f)
 {	
 	bmesh_loop_reverse(bm, f);
-	mul_v3_fl(f->no, -1.0f);
+	negate_v3(f->no);
 }
 
 /* detects if two line segments cross each other (intersects).

Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bevel.c	2011-11-24 22:40:43 UTC (rev 42147)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bevel.c	2011-11-24 23:09:55 UTC (rev 42148)
@@ -430,7 +430,7 @@
 		
 		f = BM_Make_Ngon(bm, verts[0], verts[1], edges, BLI_array_count(edges), 0);
 		if (!f) {
-			printf("eek!!\n");
+			printf("%s: could not make face!\n", __func__);
 			continue;
 		}
 			

Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c	2011-11-24 22:40:43 UTC (rev 42147)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c	2011-11-24 23:09:55 UTC (rev 42148)
@@ -227,7 +227,7 @@
 			if (v && !e3) {			
 				if (c==0) {
 					if (BLI_array_count(vv1) && v == vv1[BLI_array_count(vv1)-1]) {
-						printf("eck!\n");
+						printf("%s: internal state waning *TODO DESCRIPTION!*\n", __func__);
 					}
 					BLI_array_append(vv1, v);
 				} else {