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_ambient_occlusion.osl | |
parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'intern/cycles/kernel/shaders/node_ambient_occlusion.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_ambient_occlusion.osl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl index 7bf28719e78..22d245d0698 100644 --- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl +++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stdosl.h" +#include "stdcycles.h" shader node_ambient_occlusion(color ColorIn = color(1.0, 1.0, 1.0), int samples = 16, |