diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_fluidsim.c | |
parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_fluidsim.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 90cd8a58cb1..bc01ca30203 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -65,9 +65,9 @@ static void freeData(ModifierData *md) fluidsim_free(fluidmd); } -static void copyData(ModifierData *md, ModifierData *target) +static void copyData(const ModifierData *md, ModifierData *target) { - FluidsimModifierData *fluidmd = (FluidsimModifierData *) md; + const FluidsimModifierData *fluidmd = (const FluidsimModifierData *) md; FluidsimModifierData *tfluidmd = (FluidsimModifierData *) target; if (fluidmd->fss) { |