blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Depsgraph: Use more explicit name for particle system evaluation opcode

This commit is contained in:
Sergey Sharybin 2017-07-18 11:40:23 +02:00
parent abe0527e0f
commit 62de80166e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -725,7 +725,7 @@ void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob)
scene_cow,
ob_cow,
psys),
DEG_OPCODE_PSYS_EVAL,
DEG_OPCODE_PARTICLE_SYSTEM_EVAL,
psys->name);
}

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

@ -343,7 +343,7 @@ void DepsgraphRelationBuilder::add_forcefield_relations(const OperationKey &key,
add_relation(mod_key, key, name);
}
else if (eff->psys != psys) {
OperationKey eff_key(&eff->ob->id, DEG_NODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PSYS_EVAL, eff->psys->name);
OperationKey eff_key(&eff->ob->id, DEG_NODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PARTICLE_SYSTEM_EVAL, eff->psys->name);
add_relation(eff_key, key, name);
}
}
@ -1253,7 +1253,7 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
build_animdata(&part->id);
/* this particle system */
OperationKey psys_key(&ob->id, DEG_NODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PSYS_EVAL, psys->name);
OperationKey psys_key(&ob->id, DEG_NODE_TYPE_EVAL_PARTICLES, DEG_OPCODE_PARTICLE_SYSTEM_EVAL, psys->name);
/* XXX: if particle system is later re-enabled, we must do full rebuild? */
if (!psys_check_enabled(ob, psys, G.is_rendering))

3
source/blender/depsgraph/intern/depsgraph_type_defines.cc
View File

@ -121,7 +121,8 @@ static const char *stringify_opcode(eDepsOperation_Code opcode)
STRINGIFY_OPCODE(BONE_CONSTRAINTS);
STRINGIFY_OPCODE(BONE_READY);
STRINGIFY_OPCODE(BONE_DONE);
STRINGIFY_OPCODE(PSYS_EVAL);
STRINGIFY_OPCODE(PARTICLE_SYSTEM_EVAL);
STRINGIFY_OPCODE(SCENE_LAYER_INIT);
STRINGIFY_OPCODE(SCENE_LAYER_EVAL);

2
source/blender/depsgraph/intern/depsgraph_types.h
View File

@ -207,7 +207,7 @@ typedef enum eDepsOperation_Code {
/* Particles --------------------------------------- */
/* Particle System evaluation. */
DEG_OPCODE_PSYS_EVAL,
DEG_OPCODE_PARTICLE_SYSTEM_EVAL,
/* Collections ------------------------------------- */
DEG_OPCODE_SCENE_LAYER_INIT,