[Bf-blender-cvs] [7e814d155f2] blender-v3.2-release: Fix: Move DRW_shgroup_add_material_resources(grp, mat) to after the null-check for grp.

[Martijn Versteegh]

Commit: 7e814d155f25250a6e9c4f644de661ec1173ecdb
Author: Martijn Versteegh
Date:   Fri Jul 15 11:22:10 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB7e814d155f25250a6e9c4f644de661ec1173ecdb

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

===================================================================

M	source/blender/draw/engines/eevee/eevee_volumes.c

===================================================================

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