[Bf-blender-cvs] [272ca5772d1] blender2.8: EEVEE: LookDev storage list wrongly used

[Jeroen Bakker]

Commit: 272ca5772d16858f6c8b51cbbdcb5f8a377040cd
Author: Jeroen Bakker
Date:   Mon May 28 17:18:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB272ca5772d16858f6c8b51cbbdcb5f8a377040cd

EEVEE: LookDev storage list wrongly used

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

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

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

diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index 4abe60242d6..4ae13669a01 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -47,8 +47,8 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, DRWShadingGroup **grp, GPUShad
 			GPUTexture *tex = sl->equirectangular_gputexture;
 			DRW_shgroup_uniform_texture(*grp, "image", tex);
 
-			axis_angle_to_mat3_single(stl->studiolight_matrix, 'Z', v3d->shading.studiolight_rot_z);
-			DRW_shgroup_uniform_mat3(*grp, "StudioLightMatrix", stl->studiolight_matrix);
+			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_float(*grp, "backgroundAlpha", &stl->g_data->background_alpha, 1);
 			DRW_shgroup_call_add(*grp, geom, NULL);
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 1a63cf53814..342f0331a0c 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -279,8 +279,7 @@ typedef struct EEVEE_StorageList {
 	struct EEVEE_EffectsInfo *effects;
 
 	struct EEVEE_PrivateData *g_data;
-	/* XXX: move to better place */
-	float studiolight_matrix[3][3];
+
 } EEVEE_StorageList;
 
 /* ************ LIGHT UBO ************* */
@@ -789,6 +788,8 @@ typedef struct EEVEE_PrivateData {
 	float persmat[4][4], persinv[4][4];
 	float viewmat[4][4], viewinv[4][4];
 	float winmat[4][4], wininv[4][4];
+	float studiolight_matrix[3][3];
+
 	/* Mist Settings */
 	float mist_start, mist_inv_dist, mist_falloff;
 } EEVEE_PrivateData; /* Transient data */