blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup: make format

This commit is contained in:
Aaron Carlisle 2020-10-11 13:00:49 -04:00
parent 1b04eb6c44
commit a0886d1b6e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/subdiv_mesh.c
View File

@ -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;

3
source/blender/draw/engines/eevee/eevee_volumes.c
View File

@ -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);

9
source/blender/editors/animation/anim_channels_defines.c
View File

@ -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. */