Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-05-04 18:49:49 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-05-04 18:49:49 +0300
commit41da5df29be20467bb6468d49201611f317bff40 (patch)
tree9cbdfd19375e911b0142277364c2fdd0c435e716 /source/blender/depsgraph
parent673f44fa16e6cd83efbe228b9040263f27a5c9ca (diff)
parent4a38a120245d400cb3ff56711d14231ba9c7a1b8 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 7a1df5bcb27..56dc5170dd5 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1878,8 +1878,9 @@ void DepsgraphRelationBuilder::build_particle_settings(ParticleSettings *part)
ComponentKey texture_key(&mtex->tex->id, NodeType::GENERIC_DATABLOCK);
add_relation(texture_key,
particle_settings_reset_key,
- "Particle Texture",
+ "Particle Texture -> Particle Reset",
RELATION_FLAG_FLUSH_USER_EDIT_ONLY);
+ add_relation(texture_key, particle_settings_eval_key, "Particle Texture -> Particle Eval");
/* TODO(sergey): Consider moving texture space handling to an own
* function. */
if (mtex->texco == TEXCO_OBJECT && mtex->object != nullptr) {