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)
commit0d65dda14706e9338c6906b8ed81fca2cb027e34
tree7693687f8ff90f45ea72085f2904cb866870e799
parent77a90f7666bf6eb78b8f22ab4abae300aae10ef9
parentb5b72a3f2971094860558969e255b3ee7d7ed989
Merge branch 'master' into blender2.8
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