Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 18 Feb 2018 11:33:05 +0000 (22:33 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 18 Feb 2018 11:33:05 +0000 (22:33 +1100)
commit2bc952fdb6e1474e9e568224a37bcf5cff874aaf
tree8d7c3a99896415392035ba350a606d350b6d5e37
parent5d3f679013bbbb9f0c7aae47b5653c54266cf7ca
parent7ff3cd26932cbc93068eea4dc7438442216e4ee1
Merge branch 'master' into blender2.8
26 files changed:
CMakeLists.txt
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/gpu/intern/gpu_batch.c
source/blender/python/mathutils/mathutils_bvhtree.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_operators.c
tests/gtests/blenlib/CMakeLists.txt