Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:39:47 +0000 (13:39 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:39:47 +0000 (13:39 +1100)
commit0c93bc2b637a6a3fe01b174dad2fb61895d004d2
treeb877a434d2a7af2dfdf727b9794fa46359ba670a
parent5d6e9f237be3379b63169f86b8f4117752d095b3
parenta7f16c17c260f311e136758497e5490b226ebc03
Merge branch 'master' into blender2.8
16 files changed:
build_files/build_environment/install_deps.sh
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/cloth.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/modifiers/intern/MOD_surface.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c