Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Sep 2018 15:44:36 +0000 (17:44 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 3 Sep 2018 15:44:36 +0000 (17:44 +0200)
commita43ebc63fafeb3b945529117a2efacc80399d272
treed8ab3e90e50177874f2423b3bc1486548dccd7dd
parentb46e987a70682fcfc227ec71e9726c3ad6a230db
parent265ec400ab1945cd7bc78d50b7d8f184c01fdd10
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/collision.c
40 files changed:
CMakeLists.txt
doc/python_api/rst/info_tips_and_tricks.rst
doc/python_api/rst_from_bmesh_opdefines.py
doc/python_api/sphinx_doc_gen.py
doc/python_api/sphinx_doc_gen.sh
release/scripts/modules/addon_utils.py
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
release/scripts/startup/bl_operators/object.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_clip.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/templates_py/background_job.py
source/blender/alembic/intern/abc_curves.cc
source/blender/alembic/intern/abc_nurbs.cc
source/blender/alembic/intern/abc_util.h
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/collision.c
source/blender/collada/DocumentImporter.h
source/blender/editors/animation/keyingsets.c
source/blender/imbuf/IMB_imbuf_types.h
source/blender/imbuf/intern/thumbs.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
source/blender/modifiers/intern/MOD_laplaciansmooth.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_surfacedeform.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/nodes/shader/node_shader_util.c
source/blender/python/bmesh/bmesh_py_ops_call.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c
source/blender/python/mathutils/mathutils.h
source/blender/python/mathutils/mathutils_Matrix.c
source/blender/python/mathutils/mathutils_bvhtree.c