Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Oct 2017 01:43:17 +0000 (12:43 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Oct 2017 01:43:17 +0000 (12:43 +1100)
commitb66728d63deee0fc9ef517405466d1139871251d
tree03b92d528c53e48434d4e6361ecfc1b7607d2f56
parenta8553c9fa2482ca1a19bcf96edec2e8a3d261d86
parentebb29200d3bf9460ff32100cc1ed6c436e206829
Merge branch 'master' into blender2.8
18 files changed:
intern/cycles/render/buffers.cpp
release/scripts/startup/bl_ui/properties_data_armature.py
release/scripts/startup/bl_ui/properties_object.py
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_physics_cloth.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/properties_physics_field.py
release/scripts/startup/bl_ui/properties_physics_smoke.py
release/scripts/startup/bl_ui/properties_physics_softbody.py
release/scripts/startup/bl_ui/properties_scene.py
release/scripts/startup/bl_ui/properties_texture.py
release/scripts/startup/bl_ui/space_image.py
release/scripts/startup/bl_ui/space_node.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/nla.c
source/blender/editors/animation/keyframing.c
source/blender/nodes/intern/node_socket.c