[Bf-blender-cvs] [a600e76a583] node-tree-ref: Merge branch 'master' into node-tree-ref

[Jacques Lucke]

Commit: a600e76a5838e6d725ca2e8542d9d88dcd235edd
Author: Jacques Lucke
Date:   Mon May 4 17:13:12 2020 +0200
Branches: node-tree-ref
https://developer.blender.org/rBa600e76a5838e6d725ca2e8542d9d88dcd235edd

Merge branch 'master' into node-tree-ref

===================================================================



===================================================================

diff --cc source/blender/blenkernel/CMakeLists.txt
index a92062a1366,8e73afea3ac..d571db1c042
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -178,9 -180,9 +180,10 @@@ set(SR
    intern/multires_reshape_util.c
    intern/multires_reshape_vertcos.c
    intern/multires_subdiv.c
+   intern/multires_unsubdivide.c
    intern/nla.c
    intern/node.c
 +  intern/node_tree_ref.cc
    intern/object.c
    intern/object_deform.c
    intern/object_dupli.c