griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for some build warnings.

Browse Source
This commit is contained in:
Campbell Barton
2012-06-30 16:56:23 +00:00
parent 69a7e0af02
commit 39ca3146ff
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/gpu/intern/gpu_draw.c
View File

@@ -632,12 +632,12 @@ int GPU_verify_image(Image *ima, ImageUser *iuser, int tftile, int compare, int
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 @@ int GPU_upload_dxt_texture(ImBuf *ibuf)
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

2
source/blender/python/bmesh/bmesh_py_ops.c
View File

@@ -238,7 +238,7 @@ static PyObject *pyrna_op_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *
/* 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,