Blender Git Loki
Git Commits -> Revision 204c167
Revision 204c167 by Bastien Montagne (master) June 11, 2018, 14:02 (GMT) |
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 |
Commit Details:
Full Hash: 204c167c72fe20448200dc0a1504a84762ffd926
Parent Commits: 78a8d36, 9e43919