Merge branch 'master' into blender2.8
authorLukas Tönne <lukas.toenne@gmail.com>
Thu, 1 Dec 2016 09:29:46 +0000 (10:29 +0100)
committerLukas Tönne <lukas.toenne@gmail.com>
Thu, 1 Dec 2016 09:29:46 +0000 (10:29 +0100)
commitff2a74906a7b70625a4e941c6a805f7734491204
tree562f5ccdd9f4e377d20fe22eadca48201924b4b3
parent73c1c92c0e86ce1b5a8abeaa16be2bf2c259412b
parent58877d6d082d82185ca611b704364168e5984bd7
Merge branch 'master' into blender2.8
45 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_object.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
release/scripts/startup/bl_ui/space_userpref.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_points.cc
source/blender/alembic/intern/abc_points.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenloader/intern/readfile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/intern/gpu_extensions.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_userdef.c