diff options
| author | Dalai Felinto <dalai@blender.org> | 2021-05-07 16:45:25 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2021-05-07 16:45:25 +0300 |
| commit | b78a1c05a30886df4c38b00565d22500309b5383 (patch) | |
| tree | 308aa003dff1f92b0f0e293224664c6a29a7a30c /source/blender/draw/engines | |
| parent | c58bf31aeddddc2cfa8ce84e00bf48e7a2f7c7b9 (diff) | |
| parent | d0c63a2abe60d95b899c7122a754fe82e2077da2 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.93-release'
Diffstat (limited to 'source/blender/draw/engines')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 3d24cd6fab5..809d6010f10 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -394,9 +394,10 @@ static bool eevee_volume_object_grids_init(Object *ob, ListBase *gpu_grids, DRWS * - Grid exists and texture was loaded -> use texture. * - Grid exists but has zero size or failed to load -> use zero. * - Grid does not exist -> use default value. */ - GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture : - (volume_grid) ? e_data.dummy_zero : - eevee_volume_default_texture(gpu_grid->default_value); + GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture : + (volume_grid) ? + e_data.dummy_zero : + eevee_volume_default_texture(gpu_grid->default_value); DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex); |