diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/blenkernel/intern/studiolight.c | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/studiolight.c')
| -rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index b116e99e63b..c20fe34b46a 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -77,17 +77,17 @@ static void studiolight_free(struct StudioLight *sl) GPU_texture_free(sl->equirectangular_radiance_gputexture); sl->equirectangular_radiance_gputexture = NULL; } - + if (sl->equirectangular_irradiance_gputexture) { GPU_texture_free(sl->equirectangular_irradiance_gputexture); sl->equirectangular_irradiance_gputexture = NULL; } - + if (sl->equirectangular_radiance_buffer) { IMB_freeImBuf(sl->equirectangular_radiance_buffer); sl->equirectangular_radiance_buffer = NULL; } - + if (sl->equirectangular_irradiance_buffer) { IMB_freeImBuf(sl->equirectangular_irradiance_buffer); sl->equirectangular_irradiance_buffer = NULL; @@ -398,7 +398,7 @@ static float texel_coord_solid_angle(float a_U, float a_V, int a_Size) } BLI_INLINE void studiolight_evaluate_specular_radiance_buffer( - ImBuf *radiance_buffer, const float normal[3], float color[3], + ImBuf *radiance_buffer, const float normal[3], float color[3], int xoffset, int yoffset, int zoffset, float zvalue) { if (radiance_buffer == NULL) { @@ -473,7 +473,7 @@ static void studiolight_calculate_irradiance_equirectangular_image(StudioLight * { if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) { /* check for cached irr file */ - + BKE_studiolight_ensure_flag(sl, STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED); float *colbuf = MEM_mallocN(STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_WIDTH * STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_HEIGHT * sizeof(float[4]), __func__); |