Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 Jun 2016 19:17:33 +0000 (05:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 Jun 2016 19:17:33 +0000 (05:17 +1000)
commita15180669891dcb4f0a4dff891e8a129b3788776
tree3907a8c7a4dc3afc3289e57dba93e0fbf9514fd9
parent10d57f991b06ae7c0a0b5e492eec8c7163debf80
parentd733826708f9b562687b78424e5c0835cba8c3c9
Merge branch 'master' into blender2.8
15 files changed:
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/GPU_basic_shader.h
source/blender/gpu/intern/gpu_basic_shader.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c