Cleanup: add _types.h suffix to DNA headers
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 00:14:08 +0000 (11:14 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 00:14:08 +0000 (11:14 +1100)
53 files changed:
intern/elbeem/extern/elbeem.h
source/blender/CMakeLists.txt
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/bullet.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_buttons/buttons_texture.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_fluidsim_types.h [moved from source/blender/makesdna/DNA_object_fluidsim.h with 99% similarity]
source/blender/makesdna/DNA_object_force_types.h [moved from source/blender/makesdna/DNA_object_force.h with 99% similarity]
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_softbody.c
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c
source/blender/physics/intern/implicit_eigen.cpp
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/voxeldata.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

index bd50b6f08dcc0251ee9db11e3ecd609619a81d53..6cc2024dde72f67fda48b20f73b8458ea0aa9cec 100644 (file)
@@ -106,7 +106,7 @@ typedef struct elbeemSimulationSettings {
 
 
 // defines for elbeemMesh->type below
-/* please keep in sync with DNA_object_fluidsim.h */
+/* please keep in sync with DNA_object_fluidsim_types.h */
 #define OB_FLUIDSIM_FLUID       4
 #define OB_FLUIDSIM_OBSTACLE    8
 #define OB_FLUIDSIM_INFLOW      16
index 905abba5a7e4fdf386d2b065d8f3e4e02f7c7d79..690e1bcf318db00486a866d4cf30276ec46c92b1 100644 (file)
@@ -63,8 +63,8 @@ set(SRC_DNA_INC
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h
        ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h
index ffaa516d81ad266883969833e8a4f27bc034a6e5..90e95542a9a3158094131dbb9df1c9382586b61d 100644 (file)
@@ -31,7 +31,7 @@ extern "C" {
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_math_geom.h"
index f0819c8d79d67457fcb1d515be36ec5958634f38..f31ae715539868c9d563ecc4704b8d6b324bcdaa 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "DNA_ID.h"
 #include "DNA_dynamicpaint_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_boid_types.h"
 #include <stdio.h> /* for FILE */
 
@@ -140,7 +140,7 @@ typedef struct PTCacheID {
        unsigned int default_step;
        unsigned int max_step;
 
-       /* flags defined in DNA_object_force.h */
+       /* flags defined in DNA_object_force_types.h */
        unsigned int data_types, info_types;
 
        /* copies point data to cache data */
index 7ca4e07076d095f478c6458dbb4d7ad5166e5c93..a2a242e7519acef4198a04dc3f918dc7bb53cf9b 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_rand.h"
index 158c6c31432babaf27bef25640cd80fb9ed56754..e9a8de4469d06341eff54b61e747e82a51795d9a 100644 (file)
@@ -53,8 +53,8 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_movieclip_types.h"
-#include "DNA_object_fluidsim.h"
-#include "DNA_object_force.h"
+#include "DNA_object_fluidsim_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_sequence_types.h"
index 088031e16a743f00327c573e6e4d11da6e5549c7..c16c0f7af316699b133401ce29e5b2678675dbf2 100644 (file)
@@ -33,7 +33,7 @@
 #include "MEM_guardedalloc.h"
 
 /* types */
-#include "DNA_object_force.h"  /* here is the softbody struct */
+#include "DNA_object_force_types.h"    /* here is the softbody struct */
 
 #include "BKE_bullet.h"
 
index 21e28f5180c77801b9b5976c55d48bca6a36aa19..bd336016838c72440a26d6dcc9a76892beeb683c 100644 (file)
@@ -36,7 +36,7 @@
 #include "DNA_effect_types.h"
 #include "DNA_group_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_meshdata_types.h"
 
index 38f5c00941c3b339a9aaa3260408549949f2960d..749c5897abbded3f4b1976e1c6acb2441493563b 100644 (file)
@@ -42,7 +42,7 @@
 #include "DNA_listBase.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_scene_types.h"
index 8e98a9f672d8f957399317d72ff0c0eb44edbd6d..30ead3ffbb65f7e108609e8f2259b64694b6fa5e 100644 (file)
@@ -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"
index 0dda3d3c7d6dce5211785309268e85244d499710..8d92ddcb053b21deeb04d759eec9cb01da5bd26a 100644 (file)
@@ -51,7 +51,7 @@
 #include "DNA_movieclip_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_node_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_sensor_types.h"
index d387e30050c9c267cbeec8d71038a5961be13cf6..4f92509827f65ace3a22d12a354617afb15c3dd2 100644 (file)
@@ -42,7 +42,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 
index c5cc7c28243c57ab0d0c0ccf3e865d2f06c6d48f..dfc732dcb7448e818f60e6e7ed474619514c5836 100644 (file)
@@ -48,7 +48,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_scene_types.h"
@@ -96,7 +96,7 @@
 
 /* fluid sim particle import */
 #ifdef WITH_MOD_FLUID
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 #include "LBM_fluidsim.h"
 #include <zlib.h>
 #include <string.h>
index 7a1b378b3c4a7a7f34a86e0f59d55c9c2d1569d4..dc1c0da4401391a11eb951933d588f6a92a97522 100644 (file)
@@ -40,7 +40,7 @@
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
index 03eb83376e7aeaaa43829d059935f11f2193388b..39b0668f0b9629717141464986ed534a6843a31f 100644 (file)
@@ -50,7 +50,7 @@
 #include "DNA_group_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
 
index 4c1beb78bbfadf1cb8bb311720e607cfea93d5dd..2a25de121b37e638d68deac0a53973a3ac945d28 100644 (file)
@@ -81,7 +81,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"
index 5ec81f62bd06531765b029fa795c30d788f05e4d..d308bd54da3d2ede40c5fda287fb961e8e1ac850 100644 (file)
@@ -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"
index 77542d8deb9ff72dbec0f982a2e464868b8b56a7..dad61868961a0c1e2e134051c0238aa20de63743 100644 (file)
@@ -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"
index 75acd620c863864ac3029bcda33e43c7a1732690..d27c1ce16d32a76f9d645843ad847446932ddd1d 100644 (file)
@@ -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"
index a7a3ff6e32324fdc92e85273ec252393b765e328..80490081337cc0a49e8b4f5d59cd24bcd0f7d08e 100644 (file)
@@ -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"
index 11ad960259f3c943bbdd986a481a191801da07f1..ceb1233596a05444b440c980fcdb841dd497749f 100644 (file)
 #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_property_types.h"
index 553442e3ca5b3d01d33d9da44c602756ecc09256..65f45186ba49bb4344a7bc83cd0798090a616657 100644 (file)
@@ -66,7 +66,7 @@ extern "C" {
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_world_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
index 3884cfe49e7c50f3154de62c9dea1247a61a2d7f..0c093c26fc576d26a6cbecefdcaa8c620453e0e5 100644 (file)
@@ -46,7 +46,7 @@ extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 
 #include "BKE_main.h"
 #include "BKE_collision.h"
index 1a1f2b4232205860859d658cd634b623edc74f23..82a502db0adac6fd2f404c70e7eda79927c34f27 100644 (file)
@@ -36,7 +36,7 @@
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_brush_types.h"
 #include "DNA_texture_types.h"
 
index 9746acc7f8e278a24a5ac012540dd9292880dcb0..8d5c4684c2b92b070b11da12f2cae394cb070418 100644 (file)
@@ -42,8 +42,8 @@
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meta_types.h"
-#include "DNA_object_fluidsim.h"
-#include "DNA_object_force.h"
+#include "DNA_object_fluidsim_types.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_vfont_types.h"
index 43a5307de1cfe208fabb7e68a3ec0101c23dd594..9bdd20b0ae8639ab468842c08a233e137969bc23 100644 (file)
@@ -54,7 +54,7 @@
 #include "DNA_property_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_vfont_types.h"
 #include "DNA_mesh_types.h"
index 4e90a9bc7c41e777e821b6d974340a8c10923c30..81883725f64f6745a8e226cc1d893e3c4657d767 100644 (file)
@@ -40,7 +40,7 @@
 #include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_bitmap.h"
index 6460e83e2a0e2478819b9623d6aef5a455b67037..2f95f360fe2a5b5c9d56f5291ac5faf805e79eec 100644 (file)
@@ -39,7 +39,7 @@
 /* types */
 #include "DNA_action_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_fluidsim.h"       
+#include "DNA_object_fluidsim_types.h" 
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index e3d72ba67d852d3e2ba5fb1df8942451c8dccca2..3c48f3c11116e64294f8afc32448f3b952ca948d 100644 (file)
@@ -45,7 +45,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_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
index f7136e6e438b30d44f9b80f6a1dd1d924fcf2bc2..bbacdaebe5d8ddd93d43737d924e92819724c380 100644 (file)
@@ -603,7 +603,7 @@ typedef struct ClothModifierData {
        struct Cloth *clothObject;            /* The internal data structure for cloth. */
        struct ClothSimSettings *sim_parms;   /* definition is in DNA_cloth_types.h */
        struct ClothCollSettings *coll_parms; /* definition is in DNA_cloth_types.h */
-       struct PointCache *point_cache;       /* definition is in DNA_object_force.h */
+       struct PointCache *point_cache;       /* definition is in DNA_object_force_types.h */
        struct ListBase ptcaches;
        /* XXX nasty hack, remove once hair can be separated from cloth modifier data */
        struct ClothHairData *hairdata;
@@ -800,8 +800,8 @@ typedef enum {
 typedef struct FluidsimModifierData {
        ModifierData modifier;
 
-       struct FluidsimSettings *fss;   /* definition is in DNA_object_fluidsim.h */
-       struct PointCache *point_cache; /* definition is in DNA_object_force.h */
+       struct FluidsimSettings *fss;   /* definition is in DNA_object_fluidsim_types.h */
+       struct PointCache *point_cache; /* definition is in DNA_object_force_types.h */
 } FluidsimModifierData;
 
 typedef struct ShrinkwrapModifierData {
similarity index 99%
rename from source/blender/makesdna/DNA_object_fluidsim.h
rename to source/blender/makesdna/DNA_object_fluidsim_types.h
index 846d5788d638f5cace3522a7206dde71dad51e2a..c2816383ffbe243aced0cf649a01f71171866b0c 100644 (file)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file DNA_object_fluidsim.h
+/** \file DNA_object_fluidsim_types.h
  *  \ingroup DNA
  */
 
similarity index 99%
rename from source/blender/makesdna/DNA_object_force.h
rename to source/blender/makesdna/DNA_object_force_types.h
index 6e8d4a0480c0cc740607bf428305bf2be3f4d39c..605463be1f1eab329b6d7c4aa9ecd3e128fafca8 100644 (file)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file DNA_object_force.h
+/** \file DNA_object_force_types.h
  *  \ingroup DNA
  */
 
index c95e0a1f54a44c661b0bf1140febb10e26f94475..9932e16e98839a0b960b87592d5718149d12b5f1 100644 (file)
@@ -189,7 +189,7 @@ typedef struct SmokeDomainSettings {
        char pad[2];
 
        /* Smoke uses only one cache from now on (index [0]), but keeping the array for now for reading old files. */
-       struct PointCache *point_cache[2];      /* definition is in DNA_object_force.h */
+       struct PointCache *point_cache[2];      /* definition is in DNA_object_force_types.h */
        struct ListBase ptcaches[2];
        struct EffectorWeights *effector_weights;
        int border_collisions;  /* How domain border collisions are handled */
index 17e30de4509b6cd9a3838dea8e176b1695fd3eeb..92d54e258295a117a1417c02db212144ea627a86 100644 (file)
@@ -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",
@@ -1298,8 +1298,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"
index fb8389fc2e9ecd5caeeac54fba212402a2357bea..6d93c56885e9cd12e35340a9e1962528c5c88534 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_modifier_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
index 2935483744975eb9db08d800db968fd1c58c3c1f..c7cfde187230c7939e5159d29466340c57685375 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
index bc36af8d751adc85687592244a3fd3f33386cbea..f3d3ed4692bc66fae7eca44688effdb25a1955e3 100644 (file)
@@ -34,7 +34,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 
 #include "MEM_guardedalloc.h"
index 52bcb29d21fc129d343893c6e4ec36095ca3f2a4..7800edc30864484663de0aee654830e04119455e 100644 (file)
@@ -33,7 +33,7 @@
 #include "DNA_group_types.h"
 #include "DNA_material_types.h"
 #include "DNA_mesh_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_property_types.h"
 #include "DNA_scene_types.h"
index 3fa7eb068d1bab39c5d1b7d51c4151f8bfadb443..b3808e4dde0390ca237e625663ccf0bd96eb97a6 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "DNA_cloth_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_smoke_types.h"
index 53fe84707d1b68b10230c633d867d4dc5a2dcea0..9e52457d32a79a29b1bb0aef5636baacfb0aafa4 100644 (file)
@@ -36,7 +36,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_cloth_types.h"
 #include "DNA_particle_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_boid_types.h"
index 9b206f3ee124599af2260f5d72d7c23e7ff95a67..08665f3007a8b51a5902ea7a1be66fba248574a3 100644 (file)
@@ -42,7 +42,7 @@
 #include "BKE_pointcache.h"
 
 #include "DNA_modifier_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_smoke_types.h"
index eec978280918dcd1a1c7abe6722b0bda95ce97bc..cf777fc82ce5e0d3cf0953924959df1b3b71a46d 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "DNA_dynamicpaint_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
index 53f955b15f00b9599e7c7fb1749268e8dc7609da..368c820969427453844cd0e5c3817e1e5eec0877 100644 (file)
@@ -34,7 +34,7 @@
 
 
 #include "DNA_scene_types.h"
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 #include "DNA_object_types.h"
 
 #include "BLI_utildefines.h"
index c9f475ad228295f0e5027beca952261ee34e6a14..65f45c9af64081bf838193d3aa9ce82322d50b48 100644 (file)
@@ -40,7 +40,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index 7f2d9e42fe6a4ae063b61fe2a891c1cac2eaff84..ab4952a3aa9b57282a78de1e91e4be4ba1cf3a68 100644 (file)
@@ -41,7 +41,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_smoke_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 
 #include "BLI_utildefines.h"
 
index a0bbe5da04ae8f672e6d31e7fe1f203345b9a83e..8b33f1974907739efb12417538fc5e81060c54fe 100644 (file)
@@ -35,7 +35,7 @@
 #include <stdio.h>
 
 #include "DNA_scene_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 
 #include "BLI_utildefines.h"
 
index b694b6e994d10fa6123852847e1aae756c5a8631..5b5639495da105c225c0d7c30c190a13f69a66fe 100644 (file)
@@ -34,7 +34,7 @@ extern "C" {
 
 #include "DNA_cloth_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
index 16cd335dc0cbcc7b33e2786e148000c7499b626b..d676b1a152193acff3cc567e4a564308f3f0b307 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_texture_types.h"
 
index afe1b44163210f02925fdd6778c46a49bc2cd01f..c36fabcffb0d5b348ea919de3197830c0a80ebbb 100644 (file)
@@ -73,7 +73,7 @@
 extern "C" {
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_texture_types.h"
 
index c1c968d5ae6481ec9d7079ca180d3eeebc123d75..52cd5c3449e71b0aa7afdf52af846c1b3c1e20be 100644 (file)
@@ -56,7 +56,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
-#include "DNA_object_fluidsim.h"
+#include "DNA_object_fluidsim_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_texture_types.h"
index 1022aeeec66069939868f1fa0209d0259a14579e..c45bde300e7864d18bf8d984dfe208be89c32014 100644 (file)
@@ -61,7 +61,7 @@
 #include "BPH_mass_spring.h"
 
 #include "DNA_texture_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"
 #include "DNA_object_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_modifier_types.h"
index 4751e60996d270b8820fca8947bee3cd7455b0f4..8ba39e288cae329711a5bd4aec6592efe9253764 100644 (file)
 #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"
index 72c96668fe7f35407325813952e2740ac06063b8..78d2d88cc65d1e2b8f2c2469f42b07059706d4bd 100644 (file)
@@ -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"