[Bf-blender-cvs] [2b0d63b] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: 2b0d63be79d7afb9e3752fdd6c18b915787575bd
Author: Kévin Dietrich
Date:   Tue Jan 5 00:48:25 2016 +0100
Branches: openvdb
https://developer.blender.org/rB2b0d63be79d7afb9e3752fdd6c18b915787575bd

Merge branch 'master' into openvdb

Conflicts:
	SConstruct
	build_files/scons/config/darwin-config.py
	build_files/scons/config/linux-config.py
	build_files/scons/config/win32-mingw-config.py
	build_files/scons/config/win32-vc-config.py
	build_files/scons/config/win64-mingw-config.py
	build_files/scons/config/win64-vc-config.py
	build_files/scons/tools/Blender.py
	build_files/scons/tools/btools.py
	intern/SConscript
	intern/cycles/SConscript
	source/blender/blenkernel/SConscript
	source/blender/editors/object/SConscript
	source/blender/editors/space_view3d/SConscript
	source/blender/nodes/SConscript
	source/blender/python/SConscript

===================================================================



===================================================================