Merge branch 'master' into soc-2017-sculpting_improvements
authorwitt <sebastian.witt@rwth-aachen.de>
Mon, 12 Jun 2017 08:12:49 +0000 (10:12 +0200)
committerwitt <sebastian.witt@rwth-aachen.de>
Mon, 12 Jun 2017 08:12:49 +0000 (10:12 +0200)
commit0a410498937cc9ba709631eb1e3d188b454c54b7
tree3d097efb9eef2be3a0cfeb6d86fe5f1203800b38
parentce2671b0e29ba91e38d88858d5f5aba387d4e0c2
parent00c4f49a6d806094b2b5ef5e468b3d7114684537
Merge branch 'master' into soc-2017-sculpting_improvements
Keep the branch updated to make merging it easier later.
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/pbvh.c
source/blender/editors/space_view3d/view3d_draw.c