diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/modifiers/intern/MOD_dynamicpaint.c | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index c7386f947ce..5ca367e342a 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -47,10 +47,10 @@ #include "MOD_modifiertypes.h" -static void initData(ModifierData *md) +static void initData(ModifierData *md) { DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; - + pmd->canvas = NULL; pmd->brush = NULL; pmd->type = MOD_DYNAMICPAINT_TYPE_CANVAS; @@ -60,7 +60,7 @@ static void copyData(const ModifierData *md, ModifierData *target) { const DynamicPaintModifierData *pmd = (const DynamicPaintModifierData *)md; DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target; - + dynamicPaint_Modifier_copy(pmd, tpmd); } @@ -79,7 +79,7 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) DynamicPaintSurface *surface = pmd->canvas->surfaces.first; for (; surface; surface = surface->next) { /* tface */ - if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ || + if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ || surface->init_color_type == MOD_DPAINT_INITIAL_TEXTURE) { dataMask |= CD_MASK_MLOOPUV; |