blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin 2017-11-17 15:28:36 +01:00
parent 2d89b43fd2 9c0a38ee33
commit 44183a3535
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -191,7 +191,7 @@ static bool particle_system_depends_on_time(ParticleSystem *psys)
return false;
}
static bool object_particles_depends_oin_time(Object *object)
static bool object_particles_depends_on_time(Object *object)
{
LINKLIST_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
if (particle_system_depends_on_time(psys)) {
@ -1369,10 +1369,9 @@ void DepsgraphRelationBuilder::build_particles(Object *ob)
OperationKey eval_init_key(&ob->id,
DEG_NODE_TYPE_EVAL_PARTICLES,
DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
/* TODO(sergey): Are all particle systems depends on time?
* Hair without dynamics i.e.
*/
add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys");
if (object_particles_depends_on_time(ob)) {
add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys");
}
/* particle systems */
LINKLIST_FOREACH (ParticleSystem *, psys, &ob->particlesystem) {
@ -1682,7 +1681,7 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *ob)
*
* Ideally we need to get rid of this relation.
*/
if (object_particles_depends_oin_time(ob)) {
if (object_particles_depends_on_time(ob)) {
TimeSourceKey time_key;
OperationKey obdata_ubereval_key(&ob->id,
DEG_NODE_TYPE_GEOMETRY,