Merge branch 'master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 3 Jul 2017 13:07:14 +0000 (15:07 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 3 Jul 2017 13:18:46 +0000 (15:18 +0200)
commitd97c3bc7ad13cb9e3ec2248ce035a62c28ac70f8
tree6dc5b6169e1398b4dc53f5aefc7304cb13ccbcda
parent871325e26fe12efe8bf8a7042d94896f2f7faf6c
parenteb1532a86094ba5d59bf62b1fbd50f74a639d0a8
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/util/undo.c
source/blender/gpu/shaders/gpu_shader_material.glsl