diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-10-08 00:45:12 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-10-08 00:45:12 +0300 |
| commit | 2ed302b5e13111b62b37cdd6a1d081e818f1574b (patch) | |
| tree | cd0267ea3cb9256727143aa3f69dcc8742c523c2 /source/blender/blenkernel/intern/particle.c | |
| parent | 2c803124d371bbbd564dd4c5051258f53b799d36 (diff) | |
| parent | f3f0ea8dc27e457f61667eb24c476646c46ae0a9 (diff) | |
Merge branch 'master' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index d4d6a2f58a4..9e09eb9c451 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2462,7 +2462,7 @@ bool do_guides(Depsgraph *depsgraph, if (guidetime != 0.0f) { /* curve direction */ cross_v3_v3v3(temp, eff->guide_dir, guidedir); - angle = dot_v3v3(eff->guide_dir, guidedir) / (len_v3(eff->guide_dir)); + angle = dot_v3v3(eff->guide_dir, guidedir) / len_v3(eff->guide_dir); angle = saacos(angle); axis_angle_to_quat(rot2, temp, angle); mul_qt_v3(rot2, vec_to_point); @@ -2987,8 +2987,7 @@ static void psys_thread_create_path(ParticleTask *task, * pa->num, pa->fuv, * NULL); */ - cpa_num = (ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND)) ? pa->num : - pa->num_dmcache; + cpa_num = ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND) ? pa->num : pa->num_dmcache; /* XXX hack to avoid messed up particle num and subsequent crash (T40733) */ if (cpa_num > ctx->sim.psmd->mesh_final->totface) { @@ -3849,7 +3848,7 @@ static void psys_face_mat(Object *ob, Mesh *mesh, ParticleData *pa, float mat[4] MFace *mface; const float(*orcodata)[3]; - int i = (ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND)) ? pa->num : pa->num_dmcache; + int i = ELEM(pa->num_dmcache, DMCACHE_ISCHILD, DMCACHE_NOTFOUND) ? pa->num : pa->num_dmcache; if (i == -1 || i >= mesh->totface) { unit_m4(mat); return; |