Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 14:29:07 +0000 (16:29 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 12 Jun 2018 14:29:07 +0000 (16:29 +0200)
commit7d36408b8279a10940f7f1f5a9f2e59c89d5c680
treeba9a7919eda0a655005d2d7c8992a56d840bd430
parent866127d9f2f736845c23dcc1b06b4aa25dbde15c
parentec4ce908db6124037c4dfd927f22a9eec0ba4d52
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_draw.c
source/blender/python/intern/gpu_offscreen.c