Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2018 18:15:21 +0000 (20:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2018 18:15:21 +0000 (20:15 +0200)
commit37994e0af2cf6f0d7ed8a072eb765dfb022ceaef
tree07ea3a893aa2dc586f22a46681aa77c430f63317
parent192e5d65a746798f6bddf897570ff8aba55c9c5a
parent26c5a1c301d3d554c4b1244b219f9883249f382d
Merge branch 'master' into blender2.8
15 files changed:
intern/cycles/blender/blender_camera.cpp
intern/cycles/blender/blender_object.cpp
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_query.c
source/blender/editors/interface/interface_region_search.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/interface/view2d_ops.c