Bastien Montagne
e44743736f
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/render/render_internal.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c
2018-06-01 17:26:36 +02:00
..
2018-05-28 14:34:47 -06:00
2018-03-22 16:38:53 -04:00
2018-05-18 11:02:39 +02:00
2018-06-01 17:26:36 +02:00
2017-05-27 15:34:55 -04:00
2018-06-01 15:47:00 +02:00
2018-02-07 11:19:01 +11:00
2018-05-08 16:00:52 +02:00
2018-05-20 19:14:22 +02:00
2018-05-07 14:20:47 +02:00
2017-04-22 00:35:04 -04:00
2018-05-23 07:24:57 +02:00
2016-11-15 13:21:01 -07:00
2018-04-13 11:31:19 +02:00
2018-03-23 15:05:08 +01:00
2017-04-24 10:49:54 +02:00
2017-06-19 10:04:30 +10:00
2017-11-17 18:34:53 +01:00
2018-05-31 11:21:19 +02:00
2018-02-07 17:17:24 +01:00
2018-04-02 19:13:04 +02:00
2018-04-09 19:14:35 +03:00
2017-11-14 17:11:48 +01:00
2018-04-17 17:51:28 +02:00
2017-02-06 10:44:56 +01:00
2018-04-17 18:37:29 +02:00