4041249943
Conflicts: intern/cycles/blender/addon/properties.py intern/cycles/device/opencl/opencl_split.cpp
Conflicts: intern/cycles/blender/addon/properties.py intern/cycles/device/opencl/opencl_split.cpp