Merge branch 'blender2.8' into soc-2018-bevel
authorRohan Rathi <rohanrathi08@gmail.com>
Tue, 29 May 2018 05:40:54 +0000 (11:10 +0530)
committerRohan Rathi <rohanrathi08@gmail.com>
Tue, 29 May 2018 05:40:54 +0000 (11:10 +0530)
commit842245ac55ceca67863cdad252d8959cefb789c5
tree3301dd7fc5324ccd8b2ceea0d389f7d55b413fa8
parent5d2d36b0686d7253f9d61c00a63d273aba17677a
parent6946c413402c05a838e98a3823bf926df8cfe8d1
Merge branch 'blender2.8' into soc-2018-bevel
16 files changed:
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/draw/intern/draw_cache_impl_mesh.c
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_transform.h
source/blender/editors/mesh/editmesh_tools.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.h
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c