Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Dec 2017 09:45:20 +0000 (10:45 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 15 Dec 2017 09:45:20 +0000 (10:45 +0100)
commitf4140f2c8138ec07ba06376c4d0d70d40fca6fad
treeb6d7d87fed15896b45b1a1cccfea1175bee0f426
parent2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b
parentc4046e9082f61bfef87173d20c566a065f2602d7
Merge branch 'master' into blender2.8
17 files changed:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/depsgraph/intern/builder/deg_builder.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/depsgraph/intern/eval/deg_eval_flush.cc
source/blender/editors/render/render_update.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_text_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/modifiers/intern/MOD_correctivesmooth.c