Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2018 20:56:39 +0000 (22:56 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2018 20:56:39 +0000 (22:56 +0200)
commita61480c27103fbf449fd14ea8061b65c29f19eae
tree8d626b465ebe17936b7551aa91cc5b9d3b192607
parenta3cd57ea8c57c10d4c65ddd51faa6cce14c98e10
parent532c8ac58384309e77791e32ab78f448ad2a76a6
Merge branch 'master' into blender2.8
26 files changed:
doc/python_api/examples/gpu.offscreen.1.py
release/scripts/startup/bl_operators/add_mesh_torus.py
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_operators/file.py
release/scripts/startup/bl_operators/freestyle.py
release/scripts/startup/bl_operators/mesh.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_operators/object_quick_effects.py
release/scripts/startup/bl_operators/presets.py
release/scripts/startup/bl_operators/rigidbody.py
release/scripts/startup/bl_operators/uvcalc_follow_active.py
release/scripts/startup/bl_operators/uvcalc_lightmap.py
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_graph.py
release/scripts/startup/bl_ui/space_nla.py
release/scripts/startup/bl_ui/space_time.py
release/scripts/templates_py/batch_export.py
release/scripts/templates_py/manipulator_operator.py
release/scripts/templates_py/manipulator_operator_target.py
release/scripts/templates_py/manipulator_simple.py
release/scripts/templates_py/operator_modal_view3d.py
source/blender/editors/mesh/editmesh_bisect.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/windowmanager/intern/wm_operator_props.c