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/blenkernel/BKE_pointcache.h | |
| parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
| parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_pointcache.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_pointcache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 9a5a9e9e56a..e9be6d9f7ca 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -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 */ @@ -141,7 +141,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 */ |