Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 13 Sep 2017 13:44:13 +0000 (23:44 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 13 Sep 2017 13:44:13 +0000 (23:44 +1000)
commit37d8d4787cfa3d04b09f935c5600f1a3ea7b74e7
treeb60dfc428ccd61b5b3af6a06cee6ddbe69d3973e
parent9abacf38fd4f3b0de4b6d9a4644b9cb1155482c9
parent6f633dec5d105ad91dcb5774a6fd4fb06bf264a5
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/action.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_userdef.c
tests/python/CMakeLists.txt