[Bf-blender-cvs] [2cbffc8e408] blender2.8: Eevee: Fix assert with object volume rendering

Clément Foucault noreply at git.blender.org
Fri Aug 10 16:20:53 CEST 2018


Commit: 2cbffc8e4088d0d6a88fe90d1095cc90d2fa2b61
Author: Clément Foucault
Date:   Fri Aug 10 16:04:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2cbffc8e4088d0d6a88fe90d1095cc90d2fa2b61

Eevee: Fix assert with object volume rendering

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

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 4f163af2202..f8bb8c6f1cf 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -481,6 +481,13 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 
 	BKE_mesh_texspace_get_reference((struct Mesh *)ob->data, NULL, &texcoloc, NULL, &texcosize);
 
+	/* TODO(fclem) remove thoses "unecessary" UBOs */
+	DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
+	DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
+	DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
+	DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
+	DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo);
+
 	DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 	DRW_shgroup_uniform_mat4(grp, "volumeObjectMatrix", ob->imat);
 	DRW_shgroup_uniform_vec3(grp, "volumeOrcoLoc", texcoloc, 1);



More information about the Bf-blender-cvs mailing list