Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Jun 2017 09:40:47 +0000 (19:40 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Jun 2017 09:40:47 +0000 (19:40 +1000)
1  2 
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
source/blender/editors/transform/transform_conversions.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge