Bastien Montagne
f71efafe8f
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
2018-05-31 18:35:14 +02:00
..
2018-05-31 16:57:39 +02:00
2018-01-17 19:59:47 +01:00
2018-04-26 14:21:16 +02:00
2018-05-31 18:07:55 +02:00
2018-05-30 12:25:20 +02:00
2018-05-31 16:21:47 +02:00
2018-05-18 13:34:24 +02:00
2018-05-28 14:35:59 -06:00
2018-05-29 16:02:53 +02:00
2018-05-25 10:04:25 +02:00
2018-05-31 18:07:55 +02:00
2018-05-31 18:07:55 +02:00
2018-05-31 18:35:14 +02:00
2018-05-29 16:02:53 +02:00
2018-05-30 19:34:12 +02:00
2018-04-17 17:51:28 +02:00
2018-05-07 18:02:48 +02:00
2018-05-31 18:07:55 +02:00
2018-05-31 18:23:20 +02:00
2018-05-31 15:37:15 +02:00
2018-05-30 12:25:20 +02:00
2018-04-19 17:35:25 +02:00
2018-05-28 14:35:59 -06:00
2018-05-31 18:07:55 +02:00
2018-05-31 16:21:47 +02:00
2018-04-17 17:51:28 +02:00