Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 29 May 2018 13:59:18 +0000 (15:59 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 29 May 2018 14:02:53 +0000 (16:02 +0200)
commit8f670dd855b1d81fcf619b3b94ba4bfaf51e896d
tree681c0dabf0af6e17ead533d174fde08e55e9cd0f
parent9d037153f70c9bcc665fffa4971d1517044dbf29
parentf7af08b5feecd89ea32c8905de1e61d575ff4bf1
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_preview.c
source/blender/makesrna/intern/rna_object.c
16 files changed:
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_relations.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_object.c