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/makesdna/intern | |
| parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
| parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/intern')
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 593d93b5615..f0f1c2210f0 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -86,8 +86,8 @@ static const char *includefiles[] = { "DNA_modifier_types.h", "DNA_lattice_types.h", "DNA_object_types.h", - "DNA_object_force.h", - "DNA_object_fluidsim.h", + "DNA_object_force_types.h", + "DNA_object_fluidsim_types.h", "DNA_world_types.h", "DNA_scene_types.h", "DNA_view3d_types.h", @@ -1313,8 +1313,8 @@ int main(int argc, char **argv) #include "DNA_modifier_types.h" #include "DNA_lattice_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_object_fluidsim.h" +#include "DNA_object_force_types.h" +#include "DNA_object_fluidsim_types.h" #include "DNA_world_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" |