Commit: c0496b0ed56172e3fc521dfb4c868fe99bc52739
Author: Sergey Sharybin
Date: Mon Jan 12 17:15:25 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBc0496b0ed56172e3fc521dfb4c868fe99bc52739
Merge branch 'master' into depsgraph_refactor
===================================================================
===================================================================
diff --cc source/blender/blenkernel/CMakeLists.txt
index a967a8a,c71595e..55df1f8
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -131,10 -131,8 +132,9 @@@ 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
