Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 13:03:55 +0000 (15:03 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 13:03:55 +0000 (15:03 +0200)
commit160e62b88cdcc927b7cb3741c7ea0565412e8016
tree3561447e02e088a056f85f10d13094a7fb49b9ca
parent59562e5b259ccc1e02e4f943394ca9db5ac938c7
parentd59c2d12b1226afa3789b0ef142f8f6cc9356ead
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenkernel/BKE_object.h
12 files changed:
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/editors/object/object_add.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c