Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Jun 2017 21:21:38 +0000 (07:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Jun 2017 21:21:43 +0000 (07:21 +1000)
1  2 
source/blender/depsgraph/CMakeLists.txt
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/makesrna/intern/rna_wm.c
source/blender/modifiers/intern/MOD_array.c
source/blenderplayer/bad_level_call_stubs/stubs.c
tests/python/CMakeLists.txt

Simple merge