Files
test2/source/blender/blenkernel
Bastien Montagne 8f670dd855 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
2018-05-29 16:02:53 +02:00
..
2017-06-01 19:59:37 +02:00
2017-05-25 15:19:58 +10:00
2018-05-28 17:07:39 +02:00
2016-08-08 17:51:15 +02:00
2017-08-07 20:48:22 +02:00
2018-05-18 13:34:24 +02:00
2018-05-18 13:34:24 +02:00
2018-05-28 17:07:39 +02:00
2016-05-03 13:52:07 +10:00