Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2018 05:34:22 +0000 (07:34 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2018 05:34:22 +0000 (07:34 +0200)
commit0e0502cbdf9d13a72c96a645c5d886210118ab50
tree131565c592cd5711db168d86b41797d73998e893
parent9992079d597f20c49f6f223d45a895019bb71434
parent2c03d6a12be29b020dfdd483462322e4dd8f8d98
Merge branch 'master' into blender2.8
source/blender/editors/space_outliner/outliner_select.c
source/blender/makesdna/DNA_object_types.h