Commit: 62de80166e357b49aab1ac5fca8da9217326d6fa
Author: Sergey Sharybin
Date: Tue Jul 18 11:40:23 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB62de80166e357b49aab1ac5fca8da9217326d6fa
Depsgraph: Use more explicit name for particle system evaluation opcode
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/depsgraph_type_defines.cc
M source/blender/depsgraph/intern/depsgraph_types.h
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 935b8c543ec..33a31ac3b5f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -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);
}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 2665f28ee94..4c088be38d0 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -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))
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
index eab1913727d..ccac2aeb7ac 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cc
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cc
@@ -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);
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h
b/source/blender/depsgraph/intern/depsgraph_types.h
index 15b6f9bd00e..c6edbc4b665 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
