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 | |
parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim_types.h (renamed from source/blender/makesdna/DNA_object_fluidsim.h) | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_force_types.h (renamed from source/blender/makesdna/DNA_object_force.h) | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_smoke_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 5df7e49c2f3..72e453b7e23 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -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 { diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index 846d5788d63..c2816383ffb 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file DNA_object_fluidsim.h +/** \file DNA_object_fluidsim_types.h * \ingroup DNA */ diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force_types.h index 63e1da4f90e..622e4e6a1b4 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file DNA_object_force.h +/** \file DNA_object_force_types.h * \ingroup DNA */ diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index c95e0a1f54a..9932e16e988 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -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 */ 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" |