Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 03:27:54 +0000 (13:27 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 03:27:54 +0000 (13:27 +1000)
commitf0863f2a803d63c4bc9e3012a7fb6ceb4c194219
tree58a53050e1827f06f4c6460ad209b3e7f868af44
parent3cbf77b34f7f15c134c8df4d129fe08c0d34d111
parentce531ed1a12edcc51b717cbc12e38e8550e8f979
Merge branch 'master' into blender2.8
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface.c
source/blender/editors/screen/screen_ops.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/windowmanager/intern/wm_draw.c