[Bf-blender-cvs] [9fdc16e2047] master: Fix T63278 Eevee: LookDev: Volumetric on even if Scene World is off

Clément Foucault noreply at git.blender.org
Thu Apr 4 18:00:00 CEST 2019


Commit: 9fdc16e2047cbaac2d343be0d94a290f28bae967
Author: Clément Foucault
Date:   Thu Apr 4 17:17:40 2019 +0200
Branches: master
https://developer.blender.org/rB9fdc16e2047cbaac2d343be0d94a290f28bae967

Fix T63278 Eevee: LookDev: Volumetric on even if Scene World is off

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

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 7ba5e603e36..b752aae99f4 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -391,7 +391,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 
 		/* World Volumetric */
 		struct World *wo = scene->world;
-		if (wo != NULL && wo->use_nodes && wo->nodetree) {
+		if (wo != NULL && wo->use_nodes && wo->nodetree && !LOOK_DEV_STUDIO_LIGHT_ENABLED(draw_ctx->v3d)) {
 			struct GPUMaterial *mat = EEVEE_material_world_volume_get(scene, wo);
 
 			grp = DRW_shgroup_material_empty_tri_batch_create(mat,



More information about the Bf-blender-cvs mailing list