Merge remote-tracking branch 'origin/master' into soc-2018-npr
authorYiming Wu <xp8110@outlook.com>
Thu, 4 Apr 2019 11:14:41 +0000 (19:14 +0800)
committerYiming Wu <xp8110@outlook.com>
Thu, 4 Apr 2019 11:14:41 +0000 (19:14 +0800)
commit525c9034cd77e22d9307f3813c47a314269dda73
treeb1663d8d04afc7615a82a456810384446977a522
parenta08bf336f5425d81bacbc8fbfa77bca209de8a93
parentc384b5ddbdcb4c0b26e55a824681db1f9753e496
Merge remote-tracking branch 'origin/master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_scene.py
# source/blender/draw/intern/draw_manager_texture.c
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools
25 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_fluid.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/draw/intern/DRW_render.h
source/blender/draw/intern/draw_manager.c
source/blender/draw/intern/draw_manager_texture.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/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c