Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 17:05:46 +0000 (03:05 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Sep 2017 17:05:46 +0000 (03:05 +1000)
commitcc8c064f11060dc7157d49282f769d49d30b9439
treee7af5bb1e6b21241983a4bfa727c8a9638f92334
parent16edfc516e97042afdc3e35d46ebafcca8cd1bd9
parent6c98859b7740343cc75be7e4c568a686dfd20d0c
Merge branch 'master' into blender2.8
23 files changed:
intern/cycles/device/device_cuda.cpp
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_object_types.h
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