forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
44183a3535
@ -191,7 +191,7 @@ static bool particle_system_depends_on_time(ParticleSystem *psys)
|
|||||||
return false;
|
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) {
|
LINKLIST_FOREACH (ParticleSystem *, psys, &object->particlesystem) {
|
||||||
if (particle_system_depends_on_time(psys)) {
|
if (particle_system_depends_on_time(psys)) {
|
||||||
@ -1369,10 +1369,9 @@ void DepsgraphRelationBuilder::build_particles(Object *ob)
|
|||||||
OperationKey eval_init_key(&ob->id,
|
OperationKey eval_init_key(&ob->id,
|
||||||
DEG_NODE_TYPE_EVAL_PARTICLES,
|
DEG_NODE_TYPE_EVAL_PARTICLES,
|
||||||
DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
|
DEG_OPCODE_PARTICLE_SYSTEM_EVAL_INIT);
|
||||||
/* TODO(sergey): Are all particle systems depends on time?
|
if (object_particles_depends_on_time(ob)) {
|
||||||
* Hair without dynamics i.e.
|
|
||||||
*/
|
|
||||||
add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys");
|
add_relation(time_src_key, eval_init_key, "TimeSrc -> PSys");
|
||||||
|
}
|
||||||
|
|
||||||
/* particle systems */
|
/* particle systems */
|
||||||
LINKLIST_FOREACH (ParticleSystem *, psys, &ob->particlesystem) {
|
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.
|
* 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;
|
TimeSourceKey time_key;
|
||||||
OperationKey obdata_ubereval_key(&ob->id,
|
OperationKey obdata_ubereval_key(&ob->id,
|
||||||
DEG_NODE_TYPE_GEOMETRY,
|
DEG_NODE_TYPE_GEOMETRY,
|
||||||
|
Loading…
Reference in New Issue
Block a user