Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Thu, 29 Sep 2016 23:18:41 +0000 (01:18 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Thu, 29 Sep 2016 23:18:41 +0000 (01:18 +0200)
Conflicts:
source/blender/blenloader/intern/writefile.c

1  2 
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/intern/rna_modifier.c