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 /intern/elbeem | |
| parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
| parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/extern/elbeem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/elbeem/extern/elbeem.h b/intern/elbeem/extern/elbeem.h index bd50b6f08dc..6cc2024dde7 100644 --- a/intern/elbeem/extern/elbeem.h +++ b/intern/elbeem/extern/elbeem.h @@ -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 |