diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-11 05:25:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-11 05:33:29 +0400 |
commit | a15b3c4d111613993eca23d5f99600c2052469e7 (patch) | |
tree | 18d4bcd4291013ecf12a24def023d6f7a73ebd65 /source/blender/gpu | |
parent | 52af5fa31fbc0a1855a28d957d4387e5d6a15170 (diff) |
Code cleanup: use bool
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_material.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 101fd67af2c..bc410cb8369 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -105,8 +105,8 @@ typedef struct GPUNodeStack { const char *name; float vec[4]; struct GPUNodeLink *link; - short hasinput; - short hasoutput; + bool hasinput; + bool hasoutput; short sockettype; } GPUNodeStack; diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index c22c4fbcdf4..97084f7a887 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -261,7 +261,7 @@ void GPU_set_gpu_mipmapping(int gpu_mipmap) static void gpu_generate_mipmap(GLenum target) { - int is_ati = GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY); + const bool is_ati = GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY); int target_enabled = 0; /* work around bug in ATI driver, need to have GL_TEXTURE_2D enabled @@ -1040,7 +1040,7 @@ void GPU_paint_update_image(Image *ima, int x, int y, int w, int h) /* if color correction is needed, we must update the part that needs updating. */ if (ibuf->rect_float) { float *buffer = MEM_mallocN(w*h*sizeof(float)*4, "temp_texpaint_float_buf"); - int is_data = (ima->tpageflag & IMA_GLBIND_IS_DATA); + bool is_data = (ima->tpageflag & IMA_GLBIND_IS_DATA) != 0; IMB_partial_rect_from_float(ibuf, buffer, x, y, w, h, is_data); if (GPU_check_scaled_image(ibuf, ima, buffer, x, y, w, h)) { |