diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 03:18:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 03:19:01 +0300 |
commit | 17577c53c672dcc8d5493324c4bcb970db455f2a (patch) | |
tree | 575d227e936e1653ef200c464a28a9e4453c14dd /source/blender/blenkernel/intern/fluidsim.c | |
parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/fluidsim.c')
-rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 12b9abc6d03..a4ed7a9d63f 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -40,8 +40,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_fluidsim.h" -#include "DNA_object_force.h" // for pointcache +#include "DNA_object_fluidsim_types.h" +#include "DNA_object_force_types.h" // for pointcache #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" |