Bastien Montagne
91af8f2ae2
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
2017-11-06 18:02:46 +01:00
..
2017-09-25 10:40:50 +02:00
2017-09-01 12:27:21 +02:00
2016-01-04 14:20:48 +05:00
2017-11-06 18:02:46 +01:00
2017-03-12 02:47:53 +11:00
2017-05-27 15:34:55 -04:00
2016-01-04 14:20:48 +05:00
2017-07-03 19:53:00 +03:00
2017-05-12 16:43:36 +02:00
2017-10-11 02:15:42 +02:00
2017-11-01 01:27:03 +11:00
2017-04-22 00:35:04 -04:00
2016-07-02 10:08:33 +10:00
2017-09-29 19:16:34 +10:00
2016-11-15 13:21:01 -07:00
2017-09-20 21:50:30 +02:00
2017-07-07 09:27:24 +02:00
2017-04-24 10:49:54 +02:00
2017-06-19 10:04:30 +10:00
2017-09-19 17:50:09 +05:00
2016-06-11 22:05:20 +02:00
2017-09-08 04:20:58 +10:00
2017-08-12 14:08:03 +02:00
2017-09-25 14:44:17 +05:00
2016-01-04 14:20:48 +05:00
2017-01-09 13:12:43 +01:00
2017-09-29 19:16:34 +10:00
2017-02-06 10:44:56 +01:00
2017-03-16 23:32:35 -04:00