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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-03 20:40:21 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-03 20:40:21 +0300
commit5f056fb742fcc79df74d74911369e6b473ec10f0 (patch)
treeda59398448e3e46f0ff121d035c251a3588743d9 /source/blender/makesrna/intern/rna_particle.c
parent85776521f8d3e49abddfa35ae36c5074a88d8936 (diff)
parent3d6e7cd67c2dac8acbce585efed2fa34341f2676 (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesrna/intern/rna_particle.c')
-rw-r--r--source/blender/makesrna/intern/rna_particle.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 90658784b9a..29ec968fe2a 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -400,7 +400,6 @@ static void rna_ParticleSystem_co_hair(
}
}
else {
- zero_v3(n_co);
return;
}
@@ -410,9 +409,6 @@ static void rna_ParticleSystem_co_hair(
mul_m4_v3(particlesystem->imat, n_co);
mul_m4_v3(object->obmat, n_co);
}
- else {
- zero_v3(n_co);
- }
}
static const EnumPropertyItem *rna_Particle_Material_itemf(bContext *C,