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_string.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_string.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_convert_from_string.osl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_convert_from_string.osl b/intern/cycles/kernel/shaders/node_convert_from_string.osl index 48d894a6b3e..b496c4e6d05 100644 --- a/intern/cycles/kernel/shaders/node_convert_from_string.osl +++ b/intern/cycles/kernel/shaders/node_convert_from_string.osl @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stdosl.h" +#include "stdcycles.h" shader node_convert_from_string(string value_string = "", output color value_color = color(0.0, 0.0, 0.0), |