Blender Git Loki

Revision c06d3b6 by Sergey Sharybin (master)

July 11, 2016, 16:15 (GMT)

Cycles: Fix compilation error on Windows with OSL enabled

Seems there's some conflict around `near` identifier in that configuration.

Full Hash: c06d3b6c3650be099d50da5830e956ae77896693
Parent Commit: 7602b6b
Lines Changed: +75, -75

/intern/cycles/kernel/bvh/bvh_nodes.h (+32, -32) (Diff)
/intern/cycles/kernel/bvh/qbvh_nodes.h (+43, -43) (Diff)