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_meshsequencecache.c
parentd89f9d70c52001e09ee3ab80a3547ba140e00aec (diff)
parent3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshsequencecache.c')
-rw-r--r--source/blender/modifiers/intern/MOD_meshsequencecache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 8ca5873f85c..b908d6f4bda 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -55,10 +55,10 @@ static void initData(ModifierData *md)
mcmd->read_flag = MOD_MESHSEQ_READ_ALL;
}
-static void copyData(ModifierData *md, ModifierData *target)
+static void copyData(const ModifierData *md, ModifierData *target)
{
#if 0
- MeshSeqCacheModifierData *mcmd = (MeshSeqCacheModifierData *)md;
+ const MeshSeqCacheModifierData *mcmd = (const MeshSeqCacheModifierData *)md;
#endif
MeshSeqCacheModifierData *tmcmd = (MeshSeqCacheModifierData *)target;
@@ -66,8 +66,8 @@ static void copyData(ModifierData *md, ModifierData *target)
if (tmcmd->cache_file) {
id_us_plus(&tmcmd->cache_file->id);
- tmcmd->reader = NULL;
}
+ tmcmd->reader = NULL;
}
static void freeData(ModifierData *md)