Blender Git Commit Log

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

This commit removes somd sincos() code + fma(), as the code in master changed too much in those places. I will re-check on that and add back eventually.

Conflicts:
intern/cycles/CMakeLists.txt
intern/cycles/SConscript
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/closure/bsdf_microfacet.h
intern/cycles/kernel/geom/geom_bvh_shadow.h
intern/cycles/kernel/geom/geom_bvh_subsurface.h
intern/cycles/kernel/geom/geom_bvh_traversal.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
intern/cycles/util/util_color.h
intern/cycles/util/util_optimization.h
intern/cycles/util/util_simd.h
source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c