Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2018 04:58:34 +0000 (06:58 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jul 2018 04:58:34 +0000 (06:58 +0200)
commit00fc1d70a70694973c53d4974ed21ef888532d0a
tree5c40fa7d2a915c764b244fbed591fae5b4072a74
parente856eb7e8b65a7391c89b0938de49bb7d781f5dc
parent8c15d612a5cdfe39233c7f2b7556742091c82558
Merge branch 'master' into blender2.8
13 files changed:
doc/python_api/sphinx_doc_gen.py
release/scripts/modules/addon_utils.py
release/scripts/modules/bl_previews_utils/bl_previews_render.py
release/scripts/modules/bpy/ops.py
release/scripts/modules/bpy_extras/__init__.py
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/modules/bpy_extras/object_utils.py
release/scripts/modules/keyingsets_utils.py
release/scripts/startup/nodeitems_builtins.py
source/blender/python/simple_enum_gen.py
tests/python/bl_alembic_import_test.py
tests/python/bl_mesh_modifiers.py
tests/python/modules/render_report.py