Merge branch 'master' into blender28
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 10:25:33 +0000 (21:25 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 10:25:33 +0000 (21:25 +1100)
commitea606a7847a316a82b365155f666b33e81ff4c2e
treed58158c83fd66000fbe9db0c45fa39b6fc02076e
parentd7d32ad45217736c677edd22906d980d03aeb175
parent3df139c53062a141403ea9d359715ca3635c243c
Merge branch 'master' into blender28
33 files changed:
CMakeLists.txt
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_context.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/python/generic/bgl.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_library_load.c
source/blender/python/intern/gpu.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_window.c