diff options
| author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-10-11 20:00:49 +0300 |
|---|---|---|
| committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-10-11 20:00:49 +0300 |
| commit | a0886d1b6ec96878015eed94cc551f06358ce864 (patch) | |
| tree | b9d498f3ff9af627aff5243748730de51720102f /source | |
| parent | 1b04eb6c4443d5b6e5022a16cde7a3d7171ec926 (diff) | |
Cleanup: make format
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/subdiv_mesh.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index b0adec4e194..da6ee8d8779 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -1216,7 +1216,8 @@ Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv, subdiv_context.coarse_mesh = coarse_mesh; subdiv_context.subdiv = subdiv; subdiv_context.have_displacement = (subdiv->displacement_evaluator != NULL); - subdiv_context.can_evaluate_normals = !subdiv_context.have_displacement && subdiv_context.subdiv->settings.is_adaptive; + subdiv_context.can_evaluate_normals = !subdiv_context.have_displacement && + subdiv_context.subdiv->settings.is_adaptive; /* Multi-threaded traversal/evaluation. */ BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_MESH_GEOMETRY); SubdivForeachContext foreach_context; diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index c6e6530830d..9527c0f47b0 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -610,7 +610,8 @@ void EEVEE_volumes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) grp, NULL, USE_VOLUME_OPTI ? 1 : common_data->vol_tex_size[2]); DRW_PASS_CREATE(psl->volumetric_resolve_ps, DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_CUSTOM); - grp = DRW_shgroup_create(EEVEE_shaders_volumes_resolve_sh_get(false), psl->volumetric_resolve_ps); + grp = DRW_shgroup_create(EEVEE_shaders_volumes_resolve_sh_get(false), + psl->volumetric_resolve_ps); DRW_shgroup_uniform_texture_ref(grp, "inScattering", &txl->volume_scatter); DRW_shgroup_uniform_texture_ref(grp, "inTransmittance", &txl->volume_transmit); DRW_shgroup_uniform_texture_ref(grp, "inSceneDepth", &e_data.depth_src); diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index a9786f28ad5..338cbf2cded 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -5333,9 +5333,12 @@ void ANIM_channel_draw_widgets(const bContext *C, * - Sliders are always drawn in Shapekey mode now. Prior to this * the SACTION_SLIDERS flag would be set when changing into Shapekey mode. */ - if (((draw_sliders) - && ELEM(ale->type, ANIMTYPE_FCURVE, ANIMTYPE_NLACURVE, ANIMTYPE_SHAPEKEY, ANIMTYPE_GPLAYER)) - || ale->type == ANIMTYPE_SHAPEKEY) { + if (((draw_sliders) && ELEM(ale->type, + ANIMTYPE_FCURVE, + ANIMTYPE_NLACURVE, + ANIMTYPE_SHAPEKEY, + ANIMTYPE_GPLAYER)) || + ale->type == ANIMTYPE_SHAPEKEY) { /* adjust offset */ /* TODO: make slider width dynamic, * so that they can be easier to use when the view is wide enough. */ |