Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 13 Jun 2018 09:02:48 +0000 (11:02 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 13 Jun 2018 09:02:48 +0000 (11:02 +0200)
commit1a79c6d36081268a0f0b9f7650471b09372df121
tree0a645a43e421b961723be2febf17d8a5ac21d83a
parentf234adf65c2ae741f33f2ed4433f2990d8f6de97
parent67e8c1e1c7cfbb000de903c9c4e83874adba411f
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/particle.c
16 files changed:
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/blendfile.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_pointcache.c
source/blender/editors/space_view3d/view3d_manipulator_ruler.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/render/intern/source/pipeline.c