Merge branch 'blender-v2.83-release'

This commit is contained in:
Sergey Sharybin 2020-05-04 17:49:49 +02:00
commit 41da5df29b
1 changed files with 2 additions and 1 deletions

View File

@ -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) {