diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 17:30:34 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-21 18:08:42 +0300 |
commit | 991d4f1c6b661d9a6b00e073d9a01c8a8a133b12 (patch) | |
tree | 5f2ca156d07e3155107a09d5c3cfb2b2db128880 /source/blender/depsgraph | |
parent | 318ad705ad366f457ada2e9fe5f6c43902bd62ae (diff) |
Fix incorrect use of G.is_rendering for particles in some places.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 3 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 0c7e13197a6..d36e7eceb88 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -333,7 +333,8 @@ void DepsgraphRelationBuilder::add_forcefield_relations( bool add_absorption, const char *name) { - ListBase *effectors = pdInitEffectors(NULL, scene, object, psys, eff, false); + ::Depsgraph *depsgraph = reinterpret_cast<::Depsgraph*>(graph_); + ListBase *effectors = pdInitEffectors(depsgraph, scene, object, psys, eff, false); if (effectors == NULL) { return; } diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc index c39f6222a13..9c03e8c4ca3 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.cc +++ b/source/blender/depsgraph/intern/depsgraph_build.cc @@ -356,7 +356,8 @@ void DEG_add_forcefield_relations(DepsNodeHandle *handle, int skip_forcefield, const char *name) { - ListBase *effectors = pdInitEffectors(NULL, scene, object, NULL, effector_weights, false); + Depsgraph *depsgraph = DEG_get_graph_from_handle(handle); + ListBase *effectors = pdInitEffectors(depsgraph, scene, object, NULL, effector_weights, false); if (effectors == NULL) { return; } |