Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / kernel / kernel_path_branched.h
2015-06-15 Thomas DingesCleanup comment and remove now redundant define.
2015-06-15 Sergey SharybinCycles: Move branched path tracking into own file