archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

EEVEE: LookDev storage list wrongly used

Browse Source
This commit is contained in:
Jeroen Bakker
2018-05-28 17:18:27 +02:00
parent 9b6a30d2cb
commit 272ca5772d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/eevee/eevee_lookdev.c
View File

@@ -47,8 +47,8 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, DRWShadingGroup **grp, GPUShad
GPUTexture *tex = sl->equirectangular_gputexture; GPUTexture *tex = sl->equirectangular_gputexture;
DRW_shgroup_uniform_texture(*grp, "image", tex); DRW_shgroup_uniform_texture(*grp, "image", tex);
axis_angle_to_mat3_single(stl->studiolight_matrix, 'Z', v3d->shading.studiolight_rot_z); axis_angle_to_mat3_single(stl->g_data->studiolight_matrix, 'Z', v3d->shading.studiolight_rot_z);
DRW_shgroup_uniform_mat3(*grp, "StudioLightMatrix", stl->studiolight_matrix); 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_uniform_float(*grp, "backgroundAlpha", &stl->g_data->background_alpha, 1);
DRW_shgroup_call_add(*grp, geom, NULL); DRW_shgroup_call_add(*grp, geom, NULL);

5
source/blender/draw/engines/eevee/eevee_private.h
View File

@@ -279,8 +279,7 @@ typedef struct EEVEE_StorageList {
struct EEVEE_EffectsInfo *effects; struct EEVEE_EffectsInfo *effects;
struct EEVEE_PrivateData *g_data; struct EEVEE_PrivateData *g_data;
/* XXX: move to better place */
float studiolight_matrix[3][3];
} EEVEE_StorageList; } EEVEE_StorageList;
/* ************ LIGHT UBO ************* */ /* ************ LIGHT UBO ************* */
@@ -789,6 +788,8 @@ typedef struct EEVEE_PrivateData {
float persmat[4][4], persinv[4][4]; float persmat[4][4], persinv[4][4];
float viewmat[4][4], viewinv[4][4]; float viewmat[4][4], viewinv[4][4];
float winmat[4][4], wininv[4][4]; float winmat[4][4], wininv[4][4];
float studiolight_matrix[3][3];
/* Mist Settings */ /* Mist Settings */
float mist_start, mist_inv_dist, mist_falloff; float mist_start, mist_inv_dist, mist_falloff;
} EEVEE_PrivateData; /* Transient data */ } EEVEE_PrivateData; /* Transient data */