[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59667] trunk/blender: quiet compiler warnings

[Campbell Barton]

Revision: 59667
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59667
Author:   campbellbarton
Date:     2013-08-30 16:52:54 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
quiet compiler warnings

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/sky_model.cpp
    trunk/blender/source/blender/editors/mesh/editmesh_bisect.c
    trunk/blender/source/blender/editors/mesh/editmesh_knife.c

Modified: trunk/blender/intern/cycles/render/sky_model.cpp
===================================================================
--- trunk/blender/intern/cycles/render/sky_model.cpp	2013-08-30 16:39:39 UTC (rev 59666)
+++ trunk/blender/intern/cycles/render/sky_model.cpp	2013-08-30 16:52:54 UTC (rev 59667)
@@ -110,10 +110,6 @@
 //   Some macro definitions that occur elsewhere in ART, and that have to be
 //   replicated to make this a stand-alone module.
 
-#ifndef NIL
-#define NIL                         0
-#endif
-
 #ifndef MATH_PI 
 #define MATH_PI                     3.141592653589793
 #endif
@@ -122,10 +118,6 @@
 #define MATH_DEG_TO_RAD             ( MATH_PI / 180.0 )
 #endif
 
-#ifndef MATH_RAD_TO_DEG
-#define MATH_RAD_TO_DEG             ( 180.0 / MATH_PI )
-#endif
-
 #ifndef DEGREES
 #define DEGREES                     * MATH_DEG_TO_RAD
 #endif

Modified: trunk/blender/source/blender/editors/mesh/editmesh_bisect.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bisect.c	2013-08-30 16:39:39 UTC (rev 59666)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bisect.c	2013-08-30 16:52:54 UTC (rev 59667)
@@ -78,10 +78,11 @@
 	int x_end = RNA_int_get(op->ptr, "xend");
 	int y_end = RNA_int_get(op->ptr, "yend");
 
+	/* reference location (some point infront of the view) for finding a point on a plane */
 	const float *co_ref = rv3d->ofs;
 	float co_a_ss[2] = {x_start, y_start}, co_b_ss[2] = {x_end, y_end}, co_delta_ss[2];
 	float co_a[3], co_b[3];
-	float zfac = ED_view3d_calc_zfac(rv3d, co_ref, NULL);
+	const float zfac = ED_view3d_calc_zfac(rv3d, co_ref, NULL);
 
 	opdata = gesture->userdata;
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_knife.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-08-30 16:39:39 UTC (rev 59666)
+++ trunk/blender/source/blender/editors/mesh/editmesh_knife.c	2013-08-30 16:52:54 UTC (rev 59667)
@@ -1243,8 +1243,8 @@
 			}
 
 			n_isects = 0;
-			if (fabs(dist_to_plane_v3(kfe->v1->cageco, tri_plane)) < KNIFE_FLT_EPS &&
-			    fabs(dist_to_plane_v3(kfe->v2->cageco, tri_plane)) < KNIFE_FLT_EPS) {
+			if (fabsf(dist_to_plane_v3(kfe->v1->cageco, tri_plane)) < KNIFE_FLT_EPS &&
+			    fabsf(dist_to_plane_v3(kfe->v2->cageco, tri_plane)) < KNIFE_FLT_EPS) {
 				/* both kfe ends are in cutting triangle */
 				copy_v3_v3(isects[0], kfe->v1->cageco);
 				copy_v3_v3(isects[1], kfe->v2->cageco);