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

[Lukas Tönne]

Commit: ca94528d717783b9d289b0e01d4c02de17f04bf4
Author: Lukas Tönne
Date:   Mon Feb 16 18:28:47 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBca94528d717783b9d289b0e01d4c02de17f04bf4

Merge branch 'master' into alembic_pointcache

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 52984f3,1afdc34..091aea1
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -35,15 -35,12 +35,16 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "DNA_brush_types.h"
+ #include "DNA_camera_types.h"
  #include "DNA_cloth_types.h"
  #include "DNA_constraint_types.h"
 +#include "DNA_dynamicpaint_types.h"
 +#include "DNA_pointcache_types.h"
  #include "DNA_sdna_types.h"
 +#include "DNA_smoke_types.h"
  #include "DNA_space_types.h"
  #include "DNA_screen_types.h"
 +#include "DNA_object_force.h"
  #include "DNA_object_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_modifier_types.h"
@@@ -55,8 -51,8 +56,9 @@@
  #include "DNA_genfile.h"
  
  #include "BKE_main.h"
+ #include "BKE_modifier.h"
  #include "BKE_node.h"
 +#include "BKE_pointcache.h"
  #include "BKE_screen.h"
  
  #include "BLI_math.h"