Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Jun 2017 05:39:25 +0000 (15:39 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Jun 2017 05:39:29 +0000 (15:39 +1000)
commiteae486f5e6c79b7b31e276dfaea69d2ece7fbf7f
treedd8220e52333289fa538925a95367ae47a793e3d
parentcb23927c9b24d5b17e35c8682060cd6839337a12
parent0d8bf4bf947d84cdfc6e2b221ddb03c7f8d2114b
Merge branch 'master' into blender2.8
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/scene.c
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/editors/curve/editcurve.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/transform/transform.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/gpu/shaders/gpu_shader_material.glsl