Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 2 Dec 2018 03:15:43 +0000 (14:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 2 Dec 2018 03:16:09 +0000 (14:16 +1100)
commit2e392a0fdc0975e500d7ea07bfbfc781f5ddd190
tree92d23413d4573fb86f8e3da97e2f0a3f8d55f68d
parente1b8645c6adfb925c0c16abfb0241968d58081b4
parentc00e1f68e9b81cc4972dabb869d1b6993a3bc767
Merge branch 'master' into blender2.8
15 files changed:
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_particle.c