diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-23 00:53:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-23 00:54:35 +0300 |
| commit | 29448bd99bb05ae61e4d540981026bab87702f90 (patch) | |
| tree | ce5797a238562438cfb28832be7197af2f3ee654 /source/blender/depsgraph | |
| parent | 7547c6a250cd6f36c9894605b822380a1261febf (diff) | |
Fix T48658: Cycles render & render preview corrupts particles
Replaces `G.is_rendering` with `use_render_params` argument.
This is needed for Cycles, which attempts to restore render-preview settings from particles,
after it gets its own particle data, but fails to restore because
`G.is_rendering` was being checked in psys_cache_paths (and other places).
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index cd706c87ae0..af0b3f8b70f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -1075,7 +1075,7 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob) OperationKey psys_key(&ob->id, DEPSNODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PSYS_EVAL, psys->name); /* XXX: if particle system is later re-enabled, we must do full rebuild? */ - if (!psys_check_enabled(ob, psys)) + if (!psys_check_enabled(ob, psys, G.is_rendering)) continue; /* TODO(sergey): Are all particle systems depends on time? |