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/gameengine | |
| parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
| parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index dafcd377b1c..3b0fb335d21 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -132,7 +132,7 @@ #include "DNA_key_types.h" #include "DNA_armature_types.h" #include "DNA_action_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_constraint_types.h" #include "MEM_guardedalloc.h" diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 72c96668fe7..78d2d88cc65 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -49,7 +49,7 @@ subject to the following restrictions: #include "DNA_scene_types.h" #include "DNA_world_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" extern "C" { #include "BLI_utildefines.h" |