diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:10:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:10:43 +0300 |
| commit | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (patch) | |
| tree | fba1635d9910404d3c9043bf7637f39c45031dbe /source/blender/draw/engines/workbench | |
| parent | c0dd355926abd214570add8054e43a51af4e5b28 (diff) | |
Cleanup: whitespace
Diffstat (limited to 'source/blender/draw/engines/workbench')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 8 | ||||
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_forward.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index b2b17f7e510..4ee12a692f5 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -73,8 +73,7 @@ void workbench_private_data_get_light_direction(WORKBENCH_PrivateData *wpd, floa if (STUDIOLIGHT_ORIENTATION_CAMERA_ENABLED(wpd)) { int light_index = 0; - for (int index = 0 ; index < 3; index++) - { + for (int index = 0 ; index < 3; index++) { SolidLight *sl = &U.light[index]; if (sl->flag) { WORKBENCH_UBO_Light *light = &wd->lights[light_index++]; @@ -105,16 +104,15 @@ void workbench_private_data_get_light_direction(WORKBENCH_PrivateData *wpd, floa DRW_uniformbuffer_update(wpd->world_ubo, &wpd->world_data); } -static void workbench_private_material_free(void* data) +static void workbench_private_material_free(void *data) { - WORKBENCH_MaterialData *material_data = (WORKBENCH_MaterialData*)data; + WORKBENCH_MaterialData *material_data = data; DRW_UBO_FREE_SAFE(material_data->material_ubo); MEM_freeN(material_data); } void workbench_private_data_free(WORKBENCH_PrivateData *wpd) { - BLI_ghash_free(wpd->material_hash, NULL, workbench_private_material_free); DRW_UBO_FREE_SAFE(wpd->world_ubo); } diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 50cf5676239..dc7d80d51ce 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -548,7 +548,7 @@ void workbench_forward_draw_scene(WORKBENCH_Data *vedata) /* Write Depth + Object ID */ GPU_framebuffer_bind(fbl->object_outline_fb); DRW_draw_pass(psl->object_outline_pass); - + if (wpd->shading.xray_alpha > 0.0) { /* Shade */ GPU_framebuffer_bind(fbl->transparent_accum_fb); |