Merge branch 'master' into blender2.8

Conflicts: source/blender/blenkernel/intern/collision.c
2018-09-03 17:44:36 +02:00
parent b46e987a70 265ec400ab
commit a43ebc63fa
73 changed files with 140 additions and 140 deletions
--- a/release/scripts/freestyle/modules/freestyle/shaders.py
+++ b/release/scripts/freestyle/modules/freestyle/shaders.py
@@ -881,7 +881,7 @@ class pyBluePrintCirclesShader(StrokeShader):
        # times as possible.
        #
        # This works because the phases and directions are only
-        # dependant on the stroke length, and the chance that
+        # dependent on the stroke length, and the chance that
        # stroke.resample() above produces strokes of the same length
        # is quite high.
        #