Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 15 May 2017 05:51:54 +0000 (15:51 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 15 May 2017 05:51:54 +0000 (15:51 +1000)
1  2 
source/blender/blenloader/intern/writefile.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/space_node/node_edit.c
source/blender/makesrna/intern/rna_scene.c