[Bf-blender-cvs] [036d4fc] alembic_pointcache: Merge branch 'master' into alembic_pointcache

[Lukas Tönne]

Commit: 036d4fc3e08aebe0236f5032393347b5596bb2ee
Author: Lukas Tönne
Date:   Thu Feb 12 10:26:43 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB036d4fc3e08aebe0236f5032393347b5596bb2ee

Merge branch 'master' into alembic_pointcache

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 468f56c,572566d..52984f3
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -56,7 -51,7 +56,8 @@@
  
  #include "BKE_main.h"
  #include "BKE_node.h"
 +#include "BKE_pointcache.h"
+ #include "BKE_screen.h"
  
  #include "BLI_math.h"
  #include "BLI_listbase.h"