[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48449] trunk/blender/source/blender: fix for some build warnings.

Campbell Barton ideasman42 at gmail.com
Sat Jun 30 18:56:31 CEST 2012


Revision: 48449
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48449
Author:   campbellbarton
Date:     2012-06-30 16:56:23 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
fix for some build warnings.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_draw.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-06-30 16:56:20 UTC (rev 48448)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2012-06-30 16:56:23 UTC (rev 48449)
@@ -632,12 +632,12 @@
 void GPU_create_gl_tex(unsigned int *bind, unsigned int *pix, float * frect, int rectw, int recth, int mipmap, int use_high_bit_depth, Image *ima)
 {
 	unsigned int *scalerect = NULL;
-    float *fscalerect = NULL;
-    
-    int tpx = rectw;
-    int tpy = recth;
-    
-	/* scale if not a power of two. this is not strictly necessary for newer 
+	float *fscalerect = NULL;
+
+	int tpx = rectw;
+	int tpy = recth;
+
+	/* scale if not a power of two. this is not strictly necessary for newer
 	 * GPUs (OpenGL version >= 2.0) since they support non-power-of-two-textures */
 	if (!is_pow2_limit(rectw) || !is_pow2_limit(recth)) {
 		rectw= smaller_pow2_limit(rectw);
@@ -749,14 +749,16 @@
 
 	return 1;
 #else
-    return 0;
+	(void)ibuf;
+	return 0;
 #endif
 }
 
 void GPU_create_gl_tex_compressed(unsigned int *bind, unsigned int *pix, int x, int y, int mipmap, Image *ima, ImBuf *ibuf)
 {
 #ifndef WITH_DDS
-	// Fall back to uncompressed if DDS isn't enabled
+	(void)ibuf;
+	/* Fall back to uncompressed if DDS isn't enabled */
 	GPU_create_gl_tex(bind, pix, NULL, x, y, mipmap, 0, ima);
 #else
 

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c	2012-06-30 16:56:20 UTC (rev 48448)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_ops.c	2012-06-30 16:56:23 UTC (rev 48449)
@@ -238,7 +238,7 @@
 					/* keep this last */
 					else if (PySequence_Check(value)) {
 						BMElem **elem_array = NULL;
-						int elem_array_len;
+						Py_ssize_t elem_array_len;
 
 						elem_array = BPy_BMElem_PySeq_As_Array(&bm, value, 0, PY_SSIZE_T_MAX,
 						                                       &elem_array_len, BM_VERT | BM_EDGE | BM_FACE,




More information about the Bf-blender-cvs mailing list