Bastien Montagne
204c167c72
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/intern/mesh_convert.c
source/blender/editors/interface/interface_eyedropper_color.c
source/blender/editors/object/object_add.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_image.c
source/blender/windowmanager/intern/wm_draw.c
2018-06-11 16:02:46 +02:00
..
2018-06-08 08:10:35 +02:00
2018-06-11 16:02:46 +02:00
2018-06-08 08:10:35 +02:00
2018-06-01 18:26:42 +02:00