diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /intern/cycles/kernel/shaders/node_mapping.osl | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'intern/cycles/kernel/shaders/node_mapping.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_mapping.osl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_mapping.osl b/intern/cycles/kernel/shaders/node_mapping.osl index e8a9d940eda..8d204999630 100644 --- a/intern/cycles/kernel/shaders/node_mapping.osl +++ b/intern/cycles/kernel/shaders/node_mapping.osl @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stdosl.h" +#include "stdcycles.h" point safe_divide(point a, point b) { |