Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 12 Mar 2017 20:51:10 +0000 (07:51 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 12 Mar 2017 20:51:10 +0000 (07:51 +1100)
commit4dacda58f96d91fd4f358f418bf450bbc4bb3a43
tree9829793ba6858d49795e77cda2bb0835f35a4faa
parent6d3d2b15cbda4a51a1bbed055c35aa01b3d7c375
parente8021f5e3bd41d2447c35d999aef1a7588bc039a
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/editors/interface/interface_widgets.c
source/blender/makesrna/intern/rna_scene.c
source/blender/windowmanager/intern/wm_operators.c