Blender Git Loki
Git Commits -> Revision a7aaa6a
Revision a7aaa6a by Mai Lavelle (cycles_split_kernel) November 2, 2016, 14:29 (GMT) |
Cycles: Fix building with OSL enabled after split kernel changes Seems I had OSL disabled while working on getting the split kernel to run on CPU, should be fine now. |
Commit Details:
Full Hash: a7aaa6ab6c7e904d6e03f31f02ac7936300d1739
Parent Commit: 890dc64
Lines Changed: +66, -56
10 Modified Paths:
/intern/cycles/kernel/osl/background.cpp (+6, -6) (Diff)
/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp (+3, -3) (Diff)
/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp (+3, -3) (Diff)
/intern/cycles/kernel/osl/emissive.cpp (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_bssrdf.cpp (+10, -10) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+10, -9) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+5, -5) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+22, -18) (Diff)
/intern/cycles/kernel/split/kernel_split_common.h (+4, -0) (Diff)
/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp (+3, -3) (Diff)
/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp (+3, -3) (Diff)
/intern/cycles/kernel/osl/emissive.cpp (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_bssrdf.cpp (+10, -10) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+10, -9) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+5, -5) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+22, -18) (Diff)
/intern/cycles/kernel/split/kernel_split_common.h (+4, -0) (Diff)