Merge branch 'master' into soc-2018-npr
authorYiming Wu <xp8110@outlook.com>
Fri, 12 Apr 2019 08:33:02 +0000 (16:33 +0800)
committerYiming Wu <xp8110@outlook.com>
Fri, 12 Apr 2019 08:33:02 +0000 (16:33 +0800)
commit11229c4d413720f3658225e3d44329434befa90a
tree368c3b50c8ab1c5a6cccc9950621a4004480121b
parentf1470a84f88cabaeec6f197a50ae9864c9a66bfb
parent0ee23d0f5f613c4418a3ab2b2c67d47b936350de
Merge branch 'master' into soc-2018-npr
14 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/draw/CMakeLists.txt
source/blender/draw/intern/DRW_render.h
source/blender/draw/intern/draw_manager.c
source/blender/draw/modes/object_mode.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c