Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Sep 2017 13:56:34 +0000 (18:56 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Sep 2017 13:57:43 +0000 (18:57 +0500)
commit98ba302f7053b9bebc3854d0d05bdcaa55b6afc7
tree5109e87cb6950fe45ba09e4d1f1040f9f3a978d3
parent76444a13c36c843de74256a131642276f9d4ab80
parent675cef0a165ad535546f24faf9d0ac474f704e64
Merge branch 'master' into blender2.8
38 files changed:
CMakeLists.txt
build_files/build_environment/install_deps.sh
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
doc/doxygen/doxygen.source.h
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/armature_update.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
source/blender/depsgraph/intern/depsgraph_type_defines.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/editors/render/CMakeLists.txt
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/initrender.c
source/blender/windowmanager/CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/creator/creator_args.c