[Bf-blender-cvs] [97bb637] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: 97bb637a9c500404a181b5424cda3e1587d4b1b8
Author: Sergey Sharybin
Date:   Mon Jan 12 15:42:11 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB97bb637a9c500404a181b5424cda3e1587d4b1b8

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index ae17900,31e28f9..a967a8a
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -130,9 -130,9 +131,10 @@@ set(SR
  	intern/nla.c
  	intern/node.c
  	intern/object.c
+ 	intern/object_data_transfer.c
  	intern/object_deform.c
  	intern/object_dupli.c
 +	intern/object_update.c
  	intern/ocean.c
  	intern/packedFile.c
  	intern/paint.c