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)
1  2 
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