Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 May 2017 03:01:26 +0000 (13:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 May 2017 03:01:26 +0000 (13:01 +1000)
commit57660aac743a70eea0b917ae92dd5d6bdb1b12a9
tree59b23a0e8540e72c1d98fed5e5d75d7214482c2e
parent5a90542d3d4ba1a193975a3cb9c50eec1f6a8c8a
parentd508b69e44bb3c5911d7716048c28fe0dc5e609b
Merge branch 'master' into blender2.8
source/blender/editors/object/object_bake_api.c
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c