Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jan 2018 12:55:52 +0000 (13:55 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 15 Jan 2018 12:55:52 +0000 (13:55 +0100)
commitec3248437dc52c641a914fd1245f778ac45f3a26
tree127dd81f34e9a5412cca22b6630d598119ffd46b
parent72cb7e2726453714b150d5b9c5005db07092de67
parent75e2ae72c7771a89f3fe4e988d4deb30c9367313
Merge branch 'master' into blender2.8
12 files changed:
release/scripts/startup/bl_ui/space_view3d.py
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/cdderivedmesh.c
source/blender/blenkernel/intern/paint.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c