diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 23:17:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 23:17:06 +0300 |
| commit | ba80d8440ff6f0ae566cf5f9562046c623e30b93 (patch) | |
| tree | 8f82b19997710c243c75c514393f0e5fc24d9375 /source/blender/draw/engines/workbench | |
| parent | 1c4b04f1fde15a3be86a650b54f6e23030a97973 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/draw/engines/workbench')
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_cavity_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_cavity_frag.glsl index f6ddd54b7f7..38f55015877 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_cavity_frag.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_cavity_frag.glsl @@ -68,4 +68,4 @@ void main() ssao_factors(depth, normal_viewport, position, screenco, cavity, edges); fragColor = vec4(cavity, edges, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c index caee998e427..aad4260241f 100644 --- a/source/blender/draw/engines/workbench/workbench_deferred.c +++ b/source/blender/draw/engines/workbench/workbench_deferred.c @@ -388,7 +388,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata) psl->prepass_pass = DRW_pass_create("Prepass", state); psl->prepass_hair_pass = DRW_pass_create("Prepass", state); } - + { int state = DRW_STATE_WRITE_COLOR; psl->cavity_pass = DRW_pass_create("Cavity", state); @@ -565,11 +565,11 @@ static WORKBENCH_MaterialData *get_or_create_material_data( /* Solid */ workbench_material_update_data(wpd, ob, mat, &material_template); - material_template.object_id = OBJECT_ID_PASS_ENABLED(wpd)? engine_object_data->object_id: 1; + material_template.object_id = OBJECT_ID_PASS_ENABLED(wpd) ? engine_object_data->object_id : 1; material_template.drawtype = drawtype; material_template.ima = ima; uint hash = workbench_material_get_hash(&material_template); - + material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash)); if (material == NULL) { material = MEM_mallocN(sizeof(WORKBENCH_MaterialData), __func__); diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c index 01e10bbefbe..13821e0e57e 100644 --- a/source/blender/draw/engines/workbench/workbench_forward.c +++ b/source/blender/draw/engines/workbench/workbench_forward.c @@ -180,7 +180,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data( /* Solid */ workbench_material_update_data(wpd, ob, mat, &material_template); - material_template.object_id = OBJECT_ID_PASS_ENABLED(wpd)? engine_object_data->object_id: 1; + material_template.object_id = OBJECT_ID_PASS_ENABLED(wpd) ? engine_object_data->object_id : 1; material_template.drawtype = drawtype; material_template.ima = ima; uint hash = workbench_material_get_hash(&material_template); |