diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-12-27 16:21:03 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-12-27 16:21:03 +0300 |
| commit | ad072beb6800a5a2e9b875b32e0cbb34ac068066 (patch) | |
| tree | bd59fb168571fef2e6d6d538ea497bf5ecd410c0 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 898d2ac36c1cbd2a8e62bf57a30a6acf1f0a63fd (diff) | |
| parent | 0a118317fcf3ca3b650fc6428f6a6675303c49ee (diff) | |
Merge branch 'master' into object_nodes
Conflicts:
source/blender/depsgraph/intern/depsgraph_build_nodes.cc
source/blender/depsgraph/intern/depsgraph_build_relations.cc
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 2c83d6a3422..dfee2e9c1d2 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -363,7 +363,7 @@ static void make_duplis_frames(const DupliContext *ctx) /* special flag to avoid setting recalc flags to notify the depsgraph of * updates, as this is not a permanent change to the object */ - ob->id.flag |= LIB_ANIM_NO_RECALC; + ob->id.tag |= LIB_TAG_ANIM_NO_RECALC; for (scene->r.cfra = ob->dupsta; scene->r.cfra <= dupend; scene->r.cfra++) { int ok = 1; |