Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Jun 2016 12:34:11 +0000 (14:34 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 1 Jun 2016 12:34:11 +0000 (14:34 +0200)
commit11af9e9a5bd1caff1ec46794bda2934a01ce5035
treed4f76f59c5f6398a07a36eb8e99558e6f4a84b8d
parentfaec4309147988fbab7b7d7ec661f5130358d169
parentb08473680e141ab6f28f99fc3b1dbbc4add89bed
Merge branch 'master' into blender2.8

Conflicts:
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_particles.cpp
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph_build.cc
21 files changed:
intern/cycles/blender/blender_curves.cpp
intern/cycles/blender/blender_util.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/shaders/gpu_shader_basic_frag.glsl
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c