diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 22:40:15 +0400 |
| commit | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (patch) | |
| tree | fd6f021356fc78d6dfeff9f18f601ce645dd7ffe /source/blender/gpu | |
| parent | 7b7214c72233f72268f72d31fd8626a0f94e557e (diff) | |
style cleanup, brackets in else/if, some indentation.
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 | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index bc77d15f76b..f6db4f6e735 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -631,8 +631,7 @@ static char *code_generate_vertex(ListBase *nodes) for (node=nodes->first; node; node=node->next) for (input=node->inputs.first; input; input=input->next) if (input->source == GPU_SOURCE_ATTRIB && input->attribfirst) { - if(input->attribtype == CD_TANGENT) /* silly exception */ - { + if(input->attribtype == CD_TANGENT) { /* silly exception */ BLI_dynstr_appendf(ds, "\tvar%d.xyz = normalize((gl_ModelViewMatrix * vec4(att%d.xyz, 0)).xyz);\n", input->attribid, input->attribid); BLI_dynstr_appendf(ds, "\tvar%d.w = att%d.w;\n", input->attribid, input->attribid); } diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 7a61ee2eebc..526f293d0b9 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -278,8 +278,7 @@ static GLenum gpu_get_mipmap_filter(int mag) /* Anisotropic filtering settings */ void GPU_set_anisotropic(float value) { - if (GTS.anisotropic != value) - { + if (GTS.anisotropic != value) { GPU_free_images(); /* Clamp value to the maximum value the graphics card supports */ @@ -875,8 +874,7 @@ int GPU_update_image_time(Image *ima, double time) void GPU_free_smoke(SmokeModifierData *smd) { - if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain) - { + if(smd->type & MOD_SMOKE_TYPE_DOMAIN && smd->domain) { if(smd->domain->tex) GPU_texture_free(smd->domain->tex); smd->domain->tex = NULL; @@ -1301,8 +1299,7 @@ void GPU_end_object_materials(void) GMS.alphablend= NULL; /* resetting the texture matrix after the glScale needed for tiled textures */ - if(GTS.tilemode) - { + if(GTS.tilemode) { glMatrixMode(GL_TEXTURE); glLoadIdentity(); glMatrixMode(GL_MODELVIEW); |