Bastien Montagne
f0d9dbae0d
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/voxeldata.c
2018-06-05 17:02:50 +02:00
..
2018-06-04 09:06:14 +02:00
2018-04-22 08:45:52 +02:00
2018-06-04 09:06:14 +02:00
2018-06-05 17:02:50 +02:00
2018-06-04 09:06:14 +02:00
2018-04-02 13:13:57 +02:00
2017-03-18 12:19:03 +11:00
2017-08-18 08:45:41 +10:00
2014-09-17 18:36:17 +10:00
2018-04-20 18:55:56 +02:00