Merge branch 'master' into soc-2018-npr
authorYiming Wu <xp8110@outlook.com>
Fri, 8 Mar 2019 11:12:37 +0000 (19:12 +0800)
committerYiming Wu <xp8110@outlook.com>
Fri, 8 Mar 2019 11:12:37 +0000 (19:12 +0800)
commit26fc7ef55f1584bcf9fd262419f1a3f540c186af
tree5dc5c93434683a8f211ae5e852ac18c793bc0510
parent0ed55524f150003a0121c4e7e5f5c26c52184e00
parentcf09a2443cef60cda28c2c2023cb84728e644081
Merge branch 'master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/draw/intern/DRW_render.h
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools
35 files changed:
intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
release/scripts/startup/bl_operators/__init__.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
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/CMakeLists.txt
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/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/render/render_intern.h
source/blender/editors/render/render_ops.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesdna/DNA_light_types.h
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/CMakeLists.txt
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/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c