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/blenloader | |
| parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
| parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
6 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 236b14af8b0..faf4b3f5c8b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -86,7 +86,7 @@ #include "DNA_meshdata_types.h" #include "DNA_nla_types.h" #include "DNA_node_types.h" -#include "DNA_object_fluidsim.h" // NT +#include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_particle_types.h" diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index 7036470c8e4..f5a4a33860f 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -52,7 +52,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_node_types.h" -#include "DNA_object_fluidsim.h" // NT +#include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" #include "DNA_view3d_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 3ac934f7de7..f7301fe4664 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -41,7 +41,7 @@ #include "DNA_linestyle_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_fluidsim.h" // NT +#include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" #include "DNA_property_types.h" #include "DNA_text_types.h" diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 0800437c3d2..044c47847be 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -45,7 +45,7 @@ #include "DNA_sequence_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_mask_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 0af1c3951ad..fa2287ff6da 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -58,7 +58,7 @@ #include "DNA_meshdata_types.h" #include "DNA_nla_types.h" #include "DNA_node_types.h" -#include "DNA_object_fluidsim.h" // NT +#include "DNA_object_fluidsim_types.h" #include "DNA_object_types.h" #include "DNA_property_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 228dc4cf377..712ce334002 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -132,7 +132,7 @@ #include "DNA_material_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_packedFile_types.h" #include "DNA_particle_types.h" #include "DNA_lightprobe_types.h" |