diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-12 07:40:23 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-12 07:40:23 +0300 |
| commit | df1e9b662bd6938f74579cea9d30341f3b6dd02b (patch) | |
| tree | e71eb89d09b33a06b1fd75f71d683b631ea415ef /intern/cycles/kernel/shaders/node_convert_from_color.osl | |
| parent | 6a28d14f7236b3e6fbe7409da9ee916878d65feb (diff) | |
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
Diffstat (limited to 'intern/cycles/kernel/shaders/node_convert_from_color.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_convert_from_color.osl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_convert_from_color.osl b/intern/cycles/kernel/shaders/node_convert_from_color.osl index 7ea9a1e4fb3..c3f0e118844 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_color.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_color.osl @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stdosl.h" +#include "stdcycles.h" shader node_convert_from_color(color value_color = 0.0, output string value_string = "", |