Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-05-08 16:20:18 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-05-08 16:20:18 +0300
commit53a56b7b6c169b21df475ae94795208501581489 (patch)
tree011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_dynamicpaint.c
parentd89f9d70c52001e09ee3ab80a3547ba140e00aec (diff)
parent3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index ea8ebbc52e0..f951c96116d 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -56,9 +56,9 @@ static void initData(ModifierData *md)
pmd->type = MOD_DYNAMICPAINT_TYPE_CANVAS;
}
-static void copyData(ModifierData *md, ModifierData *target)
+static void copyData(const ModifierData *md, ModifierData *target)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+ const DynamicPaintModifierData *pmd = (const DynamicPaintModifierData *)md;
DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target;
dynamicPaint_Modifier_copy(pmd, tpmd);