diff options
| author | Martijn Versteegh <Baardaap> | 2022-07-15 12:22:10 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2022-07-15 15:56:24 +0300 |
| commit | 7e814d155f25250a6e9c4f644de661ec1173ecdb (patch) | |
| tree | 6c77d3c5c2330938faadbe7f10baafbea2e65b1d | |
| parent | 24a2b5cb1292f769dd86e314471443976d5e9512 (diff) | |
Fix: Move DRW_shgroup_add_material_resources(grp, mat) to after the null-check for grp.
Reviewed By: fclem
Maniphest Tasks: T99646
Differential Revision: https://developer.blender.org/D15436
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 8223df22ee9..533e71b9b32 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -316,12 +316,13 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, DRWShadingGroup *grp = DRW_shgroup_create(sh, vedata->psl->volumetric_objects_ps); grp = DRW_shgroup_volume_create_sub(scene, ob, grp, mat); - DRW_shgroup_add_material_resources(grp, mat); if (grp == NULL) { return; } + DRW_shgroup_add_material_resources(grp, mat); + /* TODO(fclem): remove those "unnecessary" UBOs */ DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo); DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo); |