Merge branch 'blender2.8' into soc-2018-bevel
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 12:16:41 +0000 (14:16 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Aug 2018 12:16:41 +0000 (14:16 +0200)
commit936d1cef6e6124a8f8f3ce50182afa2e1c947c6f
tree429a7503472bd8fe38ceb062086e447cb3a83423
parent4e6bcd10e559ab541df53a3d7b645faac1a7fe27
parentddd62f1b1063d69df5171c7b3457ffcffcc6b0e4
Merge branch 'blender2.8' into soc-2018-bevel

Conflicts:
release/scripts/addons
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/space_outliner/outliner_draw.c
13 files changed:
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c