diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-24 20:35:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-24 20:35:45 +0400 |
commit | da710b3e14e75db10f336009a9d32c187c632042 (patch) | |
tree | 3ac65c1d9ff16e7135033093612f5ae991f74a48 /source/blender/gpu | |
parent | da67c969b38d748049ddd118a21fa046241739fe (diff) |
style cleanup: brace placement/newlines
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 3 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 5 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 6a2c3eee7a5..a88a075383d 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -387,7 +387,8 @@ static void codegen_set_unique_ids(ListBase *nodes) /* set texid used for settings texture slot with multitexture */ if (codegen_input_has_texture(input) && - ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL))) { + ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL))) + { if (input->link) { /* input is texture from buffer, assign only one texid per * buffer to avoid sampling the same texture twice */ diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 6538da2eb61..604e8f8d50e 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -766,8 +766,9 @@ void GPU_paint_update_image(Image *ima, int x, int y, int w, int h, int mipmap) ibuf = BKE_image_get_ibuf(ima, NULL); if (ima->repbind || (gpu_get_mipmap() && mipmap) || !ima->bindcode || !ibuf || - (!is_power_of_2_i(ibuf->x) || !is_power_of_2_i(ibuf->y)) || - (w == 0) || (h == 0)) { + (!is_power_of_2_i(ibuf->x) || !is_power_of_2_i(ibuf->y)) || + (w == 0) || (h == 0)) + { /* these cases require full reload still */ GPU_free_image(ima); } diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index f4d5812ffb7..4974d57d64c 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -1074,8 +1074,9 @@ GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, /*GPU shader->object = glCreateProgramObjectARB(); if (!shader->object || - (vertexcode && !shader->vertex) || - (fragcode && !shader->fragment)) { + (vertexcode && !shader->vertex) || + (fragcode && !shader->fragment)) + { fprintf(stderr, "GPUShader, object creation failed.\n"); GPU_shader_free(shader); return NULL; |