Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Nov 2016 14:46:27 +0000 (15:46 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 7 Nov 2016 14:46:27 +0000 (15:46 +0100)
commitc1ba58c44dd771770037707cd06eb312e015280f
treef1a58e6c8a133f6482e9b5eff73ef90bc759de90
parent93dbd81796df663598df26119e1e1a5c595be840
parente74e622776a53e4ab5696d4b6fd17638dc2e9210
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/addon/properties.py
20 files changed:
build_files/build_environment/install_deps.sh
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_userdef.c
source/blenderplayer/bad_level_call_stubs/stubs.c