diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-28 18:16:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-28 18:35:51 +0300 |
commit | a0a7d92cc40fe025e04bc7b4aaca6ffac52899af (patch) | |
tree | 8c566e002ea020ccc8329a0d2a26f66b0b8bf80e /source/blender/depsgraph | |
parent | a08d039e5958ce490741db90768c5698dd1dec0f (diff) |
Partial fix of T44881: Fix for missing particles update when changing seed
Was only visible with new dependency graph.
Changing emit_from still doesn't behave fully reliably tho, that needs some
closer investigation.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build.h | 2 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_build_nodes.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_build.h b/source/blender/depsgraph/intern/depsgraph_build.h index 4088a3289ef..c5b04ec299c 100644 --- a/source/blender/depsgraph/intern/depsgraph_build.h +++ b/source/blender/depsgraph/intern/depsgraph_build.h @@ -108,7 +108,7 @@ struct DepsgraphNodeBuilder { void build_object_constraints(Scene *scene, Object *ob); void build_pose_constraints(Object *ob, bPoseChannel *pchan); void build_rigidbody(Scene *scene); - void build_particles(Object *ob); + void build_particles(Scene *scene, Object *ob); void build_animdata(ID *id); OperationDepsNode *build_driver(ID *id, FCurve *fcurve); void build_ik_pose(Scene *scene, Object *ob, bPoseChannel *pchan, bConstraint *con); diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc index 31e32ac3e75..4463df61f91 100644 --- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc +++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc @@ -448,7 +448,7 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Base *base, Object *ob) /* particle systems */ if (ob->particlesystem.first) { - build_particles(ob); + build_particles(scene, ob); } /* grease pencil */ @@ -676,7 +676,7 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene) } } -void DepsgraphNodeBuilder::build_particles(Object *ob) +void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob) { /** * Particle Systems Nodes @@ -707,7 +707,7 @@ void DepsgraphNodeBuilder::build_particles(Object *ob) /* this particle system */ // TODO: for now, this will just be a placeholder "ubereval" node add_operation_node(psys_comp, - DEPSOP_TYPE_EXEC, function_bind(BKE_particle_system_eval, _1, ob, psys), + DEPSOP_TYPE_EXEC, function_bind(BKE_particle_system_eval, _1, scene, ob, psys), DEG_OPCODE_PSYS_EVAL, psys->name); } |