From df1e9b662bd6938f74579cea9d30341f3b6dd02b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 11 Feb 2020 21:40:23 -0700 Subject: Cleanup: Fix build warnings from OSL shader compilation There were to copies of stdosl.h one from stock OSL and one in the cycles tree augmented with cycles specific closures. moved the cycles ones to stdcycles.h and copied the stock stdosl.h and accompanying headers from the OSL shader folder. for further details see D6812. Reviewed By: brecht Differential Revision: https://developer.blender.org/D6812 --- intern/cycles/kernel/shaders/node_glass_bsdf.osl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/shaders/node_glass_bsdf.osl') diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index c0b8a002536..120d57c37dd 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stdosl.h" +#include "stdcycles.h" #include "node_fresnel.h" shader node_glass_bsdf(color Color = 0.8, -- cgit v1.2.3 From 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 19 Mar 2020 09:33:03 +0100 Subject: Cleanup: `make format` after SortedIncludes change --- intern/cycles/kernel/shaders/node_glass_bsdf.osl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/shaders/node_glass_bsdf.osl') diff --git a/intern/cycles/kernel/shaders/node_glass_bsdf.osl b/intern/cycles/kernel/shaders/node_glass_bsdf.osl index 120d57c37dd..0042d573f8d 100644 --- a/intern/cycles/kernel/shaders/node_glass_bsdf.osl +++ b/intern/cycles/kernel/shaders/node_glass_bsdf.osl @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "stdcycles.h" #include "node_fresnel.h" +#include "stdcycles.h" shader node_glass_bsdf(color Color = 0.8, string distribution = "sharp", -- cgit v1.2.3