Blender Git Loki
Git Commits -> Revision f71efaf
Revision f71efaf by Bastien Montagne (master) May 31, 2018, 16:35 (GMT) |
Merge branch 'master' into blender2.8 Conflicts: source/blender/editors/sculpt_paint/paint_image.c source/blender/editors/space_image/image_edit.c source/blender/editors/space_image/image_ops.c source/blender/makesrna/intern/rna_material.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_space.c source/blenderplayer/bad_level_call_stubs/stubs.c |
Commit Details:
Full Hash: f71efafe8fc43083dcf573d258a1a5511d522702
Parent Commits: cfea9c2, df22cd9