[Bf-blender-cvs] [e35dab0fec2] blender2.8: Fix building for workbench in windows (BLI_INLINE)

Dalai Felinto noreply at git.blender.org
Fri Jun 1 11:55:55 CEST 2018


Commit: e35dab0fec2a8376a847cca91e6f2d2ccacc588f
Author: Dalai Felinto
Date:   Fri Jun 1 11:55:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe35dab0fec2a8376a847cca91e6f2d2ccacc588f

Fix building for workbench in windows (BLI_INLINE)

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

M	source/blender/blenkernel/intern/studiolight.c

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

diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index fa8516a0a01..1f258a40f3c 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -257,7 +257,7 @@ static void studiolight_calculate_radiance_cubemap_buffers(StudioLight *sl)
 	sl->flag |= STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED;
 }
 
-static inline void studiolight_evaluate_radiance_buffer(ImBuf *radiance_buffer, const float normal[3], float color[3], int *hits, int xoffset, int yoffset, int zoffset, float zvalue)
+BLI_INLINE void studiolight_evaluate_radiance_buffer(ImBuf *radiance_buffer, const float normal[3], float color[3], int *hits, int xoffset, int yoffset, int zoffset, float zvalue)
 {
 	if (radiance_buffer == NULL) {
 		return;
@@ -340,7 +340,7 @@ static void studiolight_calculate_diffuse_light(StudioLight *sl)
 	sl->flag |= STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED;
 }
 
-static inline void studiolight_evaluate_specular_radiance_buffer(ImBuf *radiance_buffer, const float specular, const float normal[3], float color[3], int *hits, int xoffset, int yoffset, int zoffset, float zvalue)
+BLI_INLINE void studiolight_evaluate_specular_radiance_buffer(ImBuf *radiance_buffer, const float specular, const float normal[3], float color[3], int *hits, int xoffset, int yoffset, int zoffset, float zvalue)
 {
 	if (radiance_buffer == NULL) {
 		return;



More information about the Bf-blender-cvs mailing list