Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Nov 2017 09:45:03 +0000 (20:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Nov 2017 09:45:03 +0000 (20:45 +1100)
commita8777f905846f80385fc90135e000c3169bbefc6
tree928a7db22a8553abd35f99a0afe2990be87d69ac
parentc0c696b014e3c21b923a2c21fb33a18839a3faa3
parent65af15ad887b30e678db9acab75efc7897c9197e
Merge branch 'master' into blender2.8
26 files changed:
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/animation/anim_markers.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/curve/editcurve.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/mask/mask_ops.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_lattice.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_wm_manipulator.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/windowmanager/intern/wm_files.c