diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 17:06:32 +0300 |
| commit | 43be4343107b1dc2a05353a6ff41360cce27d629 (patch) | |
| tree | ad47af6e9e207dab52df58c269086c100b613f77 /source/blender/modifiers/intern/MOD_dynamicpaint.c | |
| parent | a48186c5d74b3d353c5c65cd4a930dd98cc9a603 (diff) | |
| parent | 4e4a93bc454d93ec8523f44b73a42977e2868ecc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_uvproject.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index f951c96116d..a45cb21139c 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -62,12 +62,6 @@ static void copyData(const ModifierData *md, ModifierData *target) DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target; dynamicPaint_Modifier_copy(pmd, tpmd); - - if (tpmd->canvas) { - for (DynamicPaintSurface *surface = tpmd->canvas->surfaces.first; surface; surface = surface->next) { - id_us_plus((ID *)surface->init_texture); - } - } } static void freeData(ModifierData *md) |