svn merge -r40279:40295 ^/trunk/blender

[blender-staging.git] / source / blender / blenkernel / intern / particle.c

diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 414261547d7319170afdcb7b380e6f116cb58805..ad870bb0bb88767adf0c1af4a131c2365a53fe91 100644 (file)
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -2544,7 +2544,7 @@ static void psys_thread_create_path(ParticleThread *thread, struct ChildParticle
                                                normalize_v3(v1);
                                                normalize_v3(v2);
 
-                                               d = saacos(dot_v3v3(v1, v2)) * 180.0f/(float)M_PI;
+                                               d = RAD2DEGF(saacos(dot_v3v3(v1, v2)));
                                        }
 
                                        if(p_max > p_min)