Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:23:24 +0000 (17:23 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 15:24:20 +0000 (17:24 +0200)
commit9a11aeb300cef2eef5df3b606468a6bcdaca3550
tree7265ef366b503021c8d18497d04b49a374309829
parent3a14a0381288ae9f49d1ab489a250cd29a00e771
parent95eb9f22e69622c5817707fa9534521613e7d7cc
Merge branch 'master' into blender2.8
25 files changed:
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_260.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/InstanceWriter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh_utils.h
source/blender/render/intern/source/shadeoutput.c