Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Dec 2016 12:07:00 +0000 (13:07 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Dec 2016 12:07:00 +0000 (13:07 +0100)
commit3af98b4c04b33791254a4abe0a03ed65007d5e9a
treec07a9c722b94b1cdc0648c98cefff4ea61cf6c39
parent1bfe359802a105f5075e9e17c29cd832add619fd
parent6c3d8fbeb399c394831137b511c02df642fade92
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c
intern/cycles/blender/CMakeLists.txt
intern/cycles/blender/blender_object.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_manipulator.c
source/blenderplayer/bad_level_call_stubs/stubs.c