[Bf-blender-cvs] [7a612c37996] blender2.8: LookDev: Fix crash when no world

Jeroen Bakker noreply at git.blender.org
Tue Jun 5 15:50:34 CEST 2018


Commit: 7a612c37996fb513ccbf3a36172790e7798a0ba6
Author: Jeroen Bakker
Date:   Tue Jun 5 15:49:31 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7a612c37996fb513ccbf3a36172790e7798a0ba6

LookDev: Fix crash when no world

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

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

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

diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index 8107aa33d2b..8ef52f8c553 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -51,7 +51,9 @@ void EEVEE_lookdev_cache_init(
 			axis_angle_to_mat3_single(stl->g_data->studiolight_matrix, 'Z', v3d->shading.studiolight_rot_z);
 			DRW_shgroup_uniform_mat3(*grp, "StudioLightMatrix", stl->g_data->studiolight_matrix);
 
-			DRW_shgroup_uniform_vec3(*grp, "color", &world->horr, 1);
+			if (world) {
+				DRW_shgroup_uniform_vec3(*grp, "color", &world->horr, 1);
+			}
 			DRW_shgroup_uniform_float(*grp, "backgroundAlpha", &stl->g_data->background_alpha, 1);
 			DRW_shgroup_call_add(*grp, geom, NULL);
 			if (!pinfo) {



More information about the Bf-blender-cvs mailing list