Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Mar 2017 14:42:49 +0000 (15:42 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Mar 2017 14:42:49 +0000 (15:42 +0100)
commitfc61cdf1428dc74f4ef9b834de9082f910ce08e0
treeba4f4dc67a11c83c3dea90803e578053f0aa734b
parentdd3ae7bad70ecfd466791f371b138b5b958e0a19
parent0434053f1329384c312fd07812bce48ec9c28f50
Merge branch 'master' into blender2.8
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
source/blender/editors/render/render_preview.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c